ByteForge
MergeForge
JetBrains-style three-pane merge conflict resolver for VS Code and Cursor — with AI that reads your repo, not just the conflict.
Three-pane merge editor
Your version, the editable result, and theirs — scrolled together with JetBrains colours, gutter accepts, and free editing of the blend.
AI that reads the repo
Explain or resolve conflicts with Copilot or your own key. The model can search code and history; you review every write before Apply.
Authorship & history
See who last shaped each side, open commits, and flip to a two-lane timeline of the merge — then return with state intact.
Built for real merges
Conflicts dialog, status bar, next-file loop, crash-safe snapshots, and rebase/cherry-pick-aware panes so left is always your work.
Forged at ByteForge
Chunking is checked against real git merge-file output. AI stays optional and reviewable. The same craft we use on product systems — clear boundaries, honest correctness, human ownership of the result.
Resolve merges the way JetBrains users expect
Install free on the VS Marketplace. Works in VS Code and Cursor.