Git Conflict Resolver

by sascha-wolf ALL

A little plugin to help you resolving this nasty conflicts.

Details

Version 1.4.9
Homepage github.com
Issues github.com
Modified 10 years ago
Last Seen 28 minutes ago
First Seen 11 years ago

Installs

Total 26K
Win 8K
Mac 11K
Linux 7K

	Jan 21	Jan 20	Jan 19	Jan 18	Jan 17	Jan 16	Jan 15	Jan 14	Jan 13	Jan 12	Jan 11	Jan 10	Jan 9	Jan 8	Jan 7	Jan 6	Jan 5	Jan 4	Jan 3	Jan 2	Jan 1	Dec 31	Dec 30	Dec 29	Dec 28	Dec 27	Dec 26	Dec 25	Dec 24	Dec 23	Dec 22	Dec 21	Dec 20	Dec 19	Dec 18	Dec 17	Dec 16	Dec 15	Dec 14	Dec 13	Dec 12	Dec 11	Dec 10	Dec 9	Dec 8
Windows	0	1	0	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	0	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0
Mac	0	0	0	0	0	0	2	0	2	0	0	0	0	1	2	1	0	0	0	2	0	0	0	0	0	0	2	0	2	1	0	0	0	0	0	0	0	1	0	1	0	0	0	0	0
Linux	0	1	0	1	0	1	0	0	0	0	0	1	0	0	1	0	1	0	0	0	0	0	1	0	1	0	0	0	1	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0

Readme

Source: raw.githubusercontent.com

Git Conflict Resolver

A Sublime Text plugin to help you solve this nasty merge conflicts.

Commands

Git Conflict Resolver ships with five commands: Find Next Conflict, Keep Ours, Keep Theirs, Keep Common Ancestor and Show Conflict Files.

While most of them are pretty self explaining, the Keep Common Ancestor could need some elaboration: This command is especially useful for the diff3 conflict type of Git. If you have no idea what I'm talking about then check it out it's great! (Just search for diff3 on the page)

Some clarification: The first block always represents our while the last block is always theirs.

Configuration

To configure the plugin you can use a user-settings file in your user folder. You can easily access this file over Preferences -> Git Conflict Resolver -> 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
    // In Sublime Text 2 the area will only be outlined if "fill_conflict_area" is false
    "outline_conflict_area": true,

    // This options enable the gutter marks for the different conflict groups
    "ours_gutter": true,
    "theirs_gutter": true,
    "ancestor_gutter": 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+o"], "command": "keep", "args": { "keep": "ours" } },
{ "keys": ["ctrl+alt+t"], "command": "keep", "args": { "keep": "theirs" } },
{ "keys": ["ctrl+alt+a"], "command": "keep", "args": { "keep": "ancestor" } },
{ "keys": ["ctrl+alt+c"], "command": "list_conflict_files" }