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 9 years ago
Last Seen 42 minutes ago
First Seen 11 years ago

Installs

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

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

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