ctrl+shift+p filters: :st2 :st3 :win :osx :linux
Browse

VSCMT

by drew-wallace ST3 New

A Sublime Text plugin to make resolving merge conflicts easier. Based on Visual Studio Code's method.

Details

Installs

  • Total 4
  • Win 1
  • OS X 0
  • Linux 3
Sep 21 Sep 20 Sep 19 Sep 18 Sep 17 Sep 16 Sep 15 Sep 14 Sep 13 Sep 12 Sep 11 Sep 10 Sep 9 Sep 8 Sep 7 Sep 6 Sep 5 Sep 4 Sep 3 Sep 2 Sep 1 Aug 31 Aug 30 Aug 29 Aug 28 Aug 27 Aug 26 Aug 25 Aug 24 Aug 23 Aug 22 Aug 21 Aug 20 Aug 19 Aug 18 Aug 17 Aug 16 Aug 15 Aug 14 Aug 13 Aug 12 Aug 11 Aug 10 Aug 9 Aug 8
Windows 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 0 0 0 0 0 0
OS X 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 1 1 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

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" }