[leafOfTree]

Summary

You can now resolve merge conflicts in Vim, so you no longer have to go back to a terminal. The window is modeled on IntelliJ IDEA's Merge dialog.

• Entry point: when a pull or a branch merge (<C-o> in :ProjectGitBranch) stops on conflicts, the local changes open on the Unmerged changelist. Before, you only got git's output. Opening a conflicting file (Enter by default) shows yours | result | theirs in a new tab.
• Merge window (autoload/project/git_merge.vim):
  • Conflicts line up across the three panes and are colored by state: unresolved, taken from a side, or edited by hand.
  • All panes are read-only. Each key acts on the conflict under the cursor, and any choice can be changed or undone.
  • Keys: < yours, > theirs, = both, e edit by hand, u undo, ]c / [c move, L / R take one side for every conflict.
  • q writes the file and runs git add. It is refused while conflicts are unresolved. Q discards your choices.
  • A help bar at the bottom always shows the keys, and the status line shows the conflict under the cursor (2/5 3 unresolved). Both use the keys from git_merge_mappings.
  • Pane titles show the branch and commit each side comes from. In a rebase, "yours" is the commit being rebased.
• After the last file, it offers to commit the merge, or to continue the rebase, cherry-pick or revert. A in the local changes aborts it.
• Conflict states: all unmerged states (AA, DU, UD, ...) are listed as conflicts, not only UU. A file deleted on one side asks whether to keep it or delete it.
• Branch list: it runs git fetch --all --prune in the background when it opens, and refreshes only when a branch moved. git_branch_fetch turns this off.
• CI: Basic-Test installs Neovim from its release. The neovim PPA has no build for Ubuntu 26.04, which ubuntu-latest now uses, so the job was failing before any test ran.
• Demo: test/demo_merge.sh [merge|rebase|delete] creates a repository stopped on conflicts so you can try the window by hand.

Testing

• New test/cases/git_merge_test.vim cases cover:
  • parsing the conflicts, and the merge state;
  • taking a side, undo and both;
  • edit by hand, including closing the edit window with :wq, :x and :q!;
  • accept and discard, and finishing the merge;
  • abort;
  • configured keys and the conflict number.
• New case in test/cases/git_branch_test.vim: a branch pushed from another clone shows up after the background fetch.
• Vim 9.1 runs locally: 140 passed. CI on dev-merge is green.

https://claude.ai/code/session_01BwofrMkZ4QpGsCYYSgncrd

---

Generated by Claude Code