Sublime Forum

Allow conflicts (in rebases) to select resolve options (ours/theirs) per conflict instead of just full files


I just had a huge conflict I needed to resolve when rebasing a feature branch after the main branch received large scale reformatting.

Unfortunately I can only choose to resolve the whole file using ours/theirs but not individual conflicts, which now makes me wade through the conflicts in my editor (Sublime of course).

It would be helpful to have conflict-level options (like hunk-based when staging regular commits) there.

PS: I initially stumbled over the announcement post to put things into user echo, but that seems outdated. Maybe we could mark it as such?



Sublime Merge provides a merge tool for individually resolving merge conflicts: