Bug: Unable to resolve multiple merge conflicts using 'Resolve Conflicts/Resolve using "Theirs"'

[Eric Berridge]

When merging, I can only resolve a single conflicting file at a time using the menu items Resolve Conflicts/Resolve Using "Theirs".

If I select multiple files and either right-click to access that feature via context menu or via the Sourcetree's menu bar, only one of the selected files will be resolved. This is very tedious if I have a lot of files that need to be resolved this way.

[Sahir Maharaj]

Hello @Eric Berridge

Based on my understanding, resolving multiple merge conflicts simultaneously in Sourcetree isn’t natively supported. When you select multiple files, Sourcetree processes only the first file in the selection, which can indeed be tedious.

One possible workaround is to use a terminal or a Git client that supports bulk conflict resolution, where you can apply the "theirs" strategy to multiple files in one command.

[Jaime Cuevas]

Resolving multiple file conflicts worked in the past.  This problem is new.

[Jaime Cuevas]

It went away for me after posted this and resolved a few files individually.