search

sascha-wolf / sublime-GitConflictResolver

A little plugin to help you resolving this nasty conflicts.
MIT License
44 stars 6 forks source link

Keybind instructions broken #7

Closed Bio2hazard closed 10 years ago

Bio2hazard commented 10 years ago

The command for keeping ours / theirs / ancestor is simply "keep", yet the keybind instructions assume "keep_ours", "keep_theirs" and "keep_ancestor".

To fix, change the keybind instructions to:

[
    { "keys": ["ctrl+alt+f"], "command": "find_next_conflict" },
    { "keys": ["ctrl+alt+o"], "command": "keep_ours", "args": {"keep": "ours"} },
    { "keys": ["ctrl+alt+t"], "command": "keep_theirs", "args": {"keep": "theirs"} },
    { "keys": ["ctrl+alt+a"], "command": "keep_ancestor", "args": {"keep": "ancestor"} },
    { "keys": ["ctrl+alt+c"], "command": "list_conflict_files" }
]
sascha-wolf commented 10 years ago

Oh, I see. I'll update it accordingly. Thanks for the headsup.

sascha-wolf commented 10 years ago

Update the welcome text in release 1.4.4. Thanks again.