search

sascha-wolf / sublime-GitConflictResolver

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

diff3 resolution always picks "theirs" #3

Closed paulp closed 10 years ago

paulp commented 10 years ago

Thanks for the speedy attention on diff3. Unfortunately now all three of keep_old, keep_new, keep_common_ancestor retain the same alternative. It also might be better to name them consistently with how git names them - because it's not entirely clear what is "old" and what is "new" when viewed as two changes to a common ancestor. Either of the changes might be the older one. git calls them "ours" and "theirs", including in the command line options to git-merge.

sascha-wolf commented 10 years ago

Oh jeah, that was typo. Should be fixed now. Also I followed your advice to name the commands more consistently.

paulp commented 10 years ago

The keybindings offered in the README are now out of date: keep_ours, etc. all need to be renamed to "keep". After that change I can successfully resolve for any of the 3 in diff3. Thanks.

sascha-wolf commented 10 years ago

I did that obviously a bit hastly. Should be fixed now.