Sublime Forum

Can Sublime Merge support git rerere (reusing conflict resolutions)?

#1

I just did a rebase again on a branch and sublime merge asked me to resolve the conflicts again. When I ran the same rebase from the commandline, git reused my conflict resolutions from the first time I rebased (I have git rerere enabled).

I did use sublime merge to resolve (and stage) a new conflict during the process, because I like conflict resolution (finally a kdiff3 successor), but I’d prefer not to have to go back to the command line to initiate (and continue) the rebase.

Can you add support for rerere?

0 Likes