MergeForge: Resolve Git Conflicts in VS Code or Cursor Like in JetBrains

Tired of squinting at VS Code’s stacked merge editor?

MergeForge brings a JetBrains-style three-pane conflict resolver to VS Code and Cursor — and pairs it with an AI assistant that actually reads your repository before it suggests a fix.

The problem

We’ve all been there.

You’re halfway through a rebase. Git stops. Twelve files are conflicted. You open one in VS Code… and get that familiar stacked layout: Incoming, Current, and a result pane that somehow still feels like a puzzle with half the pieces missing.

MergeForge: Resolve Git Conflicts in VS Code or Cursor Like in JetBrains

Related reading

I made git merge finish itself — in VS Code, in my terminal, and in CI

I kept seeing the same Git complaint on Reddit, so I wrote a small CLI for it

Stop Breaking Production: Pragmatic Git Refactor Diffing to Avoid Syntax Merge…

Git rerere: the feature you didnt know you needed

5 .vscode Files That Standardize Your Whole Team | Towards AI

Two coding agents editing the same issue, no merge conflict. Here is how git…