Hey Product Hunt 👋 I built MergeForge because I kept missing WebStorm’s three-pane merge editor after moving fully into VS Code and Cursor. The problem: when a rebase or merge hits conflicts, VS Code’s stacked layout makes it hard to see “my change vs their change vs the result” at once. Accept Current / Accept Incoming is fine for trivial cases — and painful when both sides matter, someone rewrote a function, or you’re mid-rebase with a dozen files left. Most “AI resolve” tools I tried only saw the conflict markers, with no sense of the branch intent or the rest of the codebase. What I wanted: • Left = mine, center = editable result (from the merge base), right = theirs • Fast gutters for accept / ignore / blend, plus apply-all non-conflicting changes • AI that can open related files, search the repo, and check history before suggesting a merge • Nothing written to git until I hit Apply — and full undo on every resolution, including AI ones How it evolved: I started with a pure visual three-way merge engine checked against real `git merge-file` output (same conflicts, byte-identical clean merges). Then came the Conflicts dialog, status bar, crash snapshots, and rebase/cherry-pick stage swapping so “yours” stays on the left even when git flips stages. AI came last — Explain, Resolve, Fix all — with live tool activity so you can see what the model actually read. MergeForge is free and open source (MIT). Install from the VS Marketplace or Open VSX, open a conflicted file, and try **Resolve in Merge Forge**. I’d love feedback from people who live in messy rebases: What’s still painful? Which AI provider are you on? Happy to answer anything in the comments and evolve this more.

MergeForge

JetBrains-style merges for VS Code/Cursor - optional AI

JetBrains-style merges for VS Code/Cursor - optional AI