VSCMT
A Sublime Text plugin to make resolving merge conflicts easier. Based on Visual Studio Code's method.
Details
Installs
- Total 134
- Win 73
- Mac 27
- Linux 34
Apr 2 | Apr 1 | Mar 31 | Mar 30 | Mar 29 | Mar 28 | Mar 27 | Mar 26 | Mar 25 | Mar 24 | Mar 23 | Mar 22 | Mar 21 | Mar 20 | Mar 19 | Mar 18 | Mar 17 | Mar 16 | Mar 15 | Mar 14 | Mar 13 | Mar 12 | Mar 11 | Mar 10 | Mar 9 | Mar 8 | Mar 7 | Mar 6 | Mar 5 | Mar 4 | Mar 3 | Mar 2 | Mar 1 | Feb 28 | Feb 27 | Feb 26 | Feb 25 | Feb 24 | Feb 23 | Feb 22 | Feb 21 | Feb 20 | Feb 19 | Feb 18 | Feb 17 | |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Windows | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
Mac | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
Linux | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
Readme
- Source
- raw.githubusercontent.com
Visual Studio Code Merge Tool
A Sublime Text plugin to help you solve merge conflicts based on how VSC does it.
Commands
VSCMT helps with these commands: Find Next Conflict
and Show Conflict Files
.
Configuration
To configure the plugin you can use a user-settings file in your user folder. You can easily access this file over Preferences
-> VSCMT
-> Settings - User
.
For information on which settings are available take a look at the commented default-settings file:
{
// The git path
// by default the plugin assumes that git is in your path
"git_path": "git",
// Enable or disable the live matching of conflict areas
// By default the plugin matches live
"live_matching": true,
// The color of the highlighting is called "scope" in Sublime Text,
// to change this color you can choose a different scope.
// This customization isn't easy, since you have to define your own
// scope in your theme file.
"matching_scope": "invalid",
// This option enables the filling the conflict area with a color
// By default the area will just be outlined
"fill_conflict_area": false,
// This option enables the outline of the conflict area
// By default the area will just be outlined
"outline_conflict_area": true,
// This option changes the display of the "Show Conflict Files" functionality"
// true: Show only the filesnames ("src/main.js" becomes "main.js")
// false: Show relative path (from the root of the repository)
// By default Git Conflict Resolver only shows the filename
"show_only_filename": true
}
Shortcuts
There are no default shortcuts, to add them open your user keybindings file and add a keybinding like the following:
{ "keys": ["ctrl+alt+f"], "command": "find_next_conflict" },
{ "keys": ["ctrl+alt+c"], "command": "list_conflict_files" }