🎉Extension merged into vscode 🎉
This extension is now part of the official Visual Studio Code feature set, as of 1.13.0. This version of the extension will no longer be maintained and any issues or pull requests should be opened against Microsoft/vscode.
See PR #27150.
Migration from extension
- Commands. All commands are identical, but have been moved from
The code here is now a reference for anyone interested
Available on the Visual Studio Extension Marketplace.
- Individual conflicts are highlighted in each file
- Command palette commands for resolving and navigating between merge conflicts (see below)
- CodeLens actions to either accept "current", "incoming" or "both" changes
- Navigation shortcuts between conflicts
All commands use a double key chord combination by default. First press
Alt+M then press the second key.
Alt+M, 1- Accept current (local) change in the current conflict
Alt+M, 2- Accept incoming change in the current conflict
Alt+M, 3- Accept the union of both the current and incoming change for the current conflict
Alt+M, Enter- Accept the change the editor cursor is currently within
Alm+M, Down Arrow- Navigate to the next conflict in the current file
Alm+M, Down Arrow- Navigate to the previous conflict in the current file
Accept all current- Accept all current changes in the current file
Accept all incoming- Accept all incoming changes in the current file
Accept all both- Accept all changes as a "both" merge in the current file
Compare current conflict- Compares the active conflict in the VSCode diff utility
NOTE: All accept commands can be undone with Undo (
The following commands are exposed if you wish to customize key bindings (Preferences > Keyboard Shortcuts)
better-merge.accept.current better-merge.accept.incoming better-merge.accept.both better-merge.accept.selection better-merge.next better-merge.previous better-merge.accept.all-current better-merge.accept.all-incoming better-merge.accept.all-both better-merge.compare
true) - Enable / disable inline code lens actions above merge conflict blocks
true) - Enable / disable additional editor decoration (background color, etc) of merge conflict blocks
true) - Enable / disable highlighting of merge conflicts in the editor overview area (right hand side)