pprice / Vscode Better Merge
Licence: mit
Better merge conflict support for vscode
Stars: ✭ 46
Programming Languages
typescript
32286 projects
Projects that are alternatives of or similar to Vscode Better Merge
vscode-note
a simple note-taking extension for vscode.
Stars: ✭ 29 (-36.96%)
Mutual labels: extension, vscode
Frontend Vscode Extensionpack
(820+ Users) Handpicked collection of vscode extensions for FE development. Get the extension @ https://marketplace.visualstudio.com/items?itemName=solodynamo.frontend-vscode-extensionpack
Stars: ✭ 329 (+615.22%)
Mutual labels: vscode, extension
root-file-viewer
View ROOT files directly in VS Code!
Stars: ✭ 20 (-56.52%)
Mutual labels: extension, vscode
Vscode Es7 Javascript React Snippets
Extension for Javascript/React snippets with search supporting ES7 and babel features
Stars: ✭ 435 (+845.65%)
Mutual labels: vscode, extension
Vscode Data Preview
Data Preview 🈸 extension for importing 📤 viewing 🔎 slicing 🔪 dicing 🎲 charting 📊 & exporting 📥 large JSON array/config, YAML, Apache Arrow, Avro, Parquet & Excel data files
Stars: ✭ 245 (+432.61%)
Mutual labels: vscode, extension
Vscode Cordova
A Visual Studio Code extension providing intellisense, debug, and build support for Cordova and Ionic projects.
Stars: ✭ 267 (+480.43%)
Mutual labels: vscode, extension
Vscode Live Frame
Run your web app inside VS Code
Stars: ✭ 173 (+276.09%)
Mutual labels: vscode, extension
Amvim For Vscode
The Vim mode for Visual Studio Code(vscode) that works as expected.
Stars: ✭ 393 (+754.35%)
Mutual labels: vscode, extension
Bracketpair
Bracket Colorizer Extension for VSCode
Stars: ✭ 374 (+713.04%)
Mutual labels: vscode, extension
Vscode Coverage Gutters
Display test coverage generated by lcov and xml - works with many languages
Stars: ✭ 226 (+391.3%)
Mutual labels: vscode, extension
Vscode React Native
VSCode extension for React Native - supports debugging and editor integration
Stars: ✭ 2,366 (+5043.48%)
Mutual labels: vscode, extension
vscode-save-and-run
Visual Studio Code extension to run commands whenever a file is saved https://marketplace.visualstudio.com/items?itemName=wk-j.save-and-run
Stars: ✭ 31 (-32.61%)
Mutual labels: extension, vscode
Vscode Vlang
V Language extension for Visual Studio Code.
Stars: ✭ 190 (+313.04%)
Mutual labels: vscode, extension
Vue Vscode Extensionpack
The extensions I use when developing a Vue application with VS Code
Stars: ✭ 264 (+473.91%)
Mutual labels: vscode, extension
Aura Theme
💅 A beautiful dark theme for your favorite apps.
Stars: ✭ 159 (+245.65%)
Mutual labels: vscode, extension
Vscode Twitch Highlighter
This is a VS Code extension that will allow your Twitch chat to highlight a line of code via a command message. Example: `!line 8 server.js`. See master branch README.md for more details
Stars: ✭ 169 (+267.39%)
Mutual labels: vscode, extension
Openvsx
An open-source registry for VS Code extensions
Stars: ✭ 344 (+647.83%)
Mutual labels: vscode, extension
Vscode Todo Plus
Manage todo lists with ease. Powerful, easy to use and customizable.
Stars: ✭ 622 (+1252.17%)
Mutual labels: vscode, extension
🎉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
- Configuration
-
better-merge.enableCodeLens-->merge-conflict.codeLens.enabled -
better-merge.enableDecorationsandbetter-merge.enableEditorOverview-->merge-conflict.decorators.enabled
-
- Commands. All commands are identical, but have been moved from
better-merge.*tomerge-conflict.*
The code here is now a reference for anyone interested 😎
vscode-better-merge (deprecated)
Better visual merge conflict support for Visual Studio Code, inspired by merge-conflicts for Atom.
Available on the Visual Studio Extension Marketplace.
Features
- 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
Commands
All commands use a double key chord combination by default. First press Alt+M then press the second key.
-
Accept current-Alt+M, 1- Accept current (local) change in the current conflict -
Accept incoming-Alt+M, 2- Accept incoming change in the current conflict -
Accept both-Alt+M, 3- Accept the union of both the current and incoming change for the current conflict -
Accept selection-Alt+M, Enter- Accept the change the editor cursor is currently within -
Next conflict-Alm+M, Down Arrow- Navigate to the next conflict in the current file -
Previous conflict-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 (Ctrl+Z / Cmd+Z)
Key bindings
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
Configuration
-
better-merge.enableCodeLens(default:true) - Enable / disable inline code lens actions above merge conflict blocks -
better-merge.enableDecorations(default:true) - Enable / disable additional editor decoration (background color, etc) of merge conflict blocks -
better-merge.enableEditorOverview(default:true) - Enable / disable highlighting of merge conflicts in the editor overview area (right hand side)
Note that the project description data, including the texts, logos, images, and/or trademarks,
for each open source project belongs to its rightful owner.
If you wish to add or remove any projects, please contact us at [email protected].