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.

[Augustus Harber]

You've perfectly described a known and frustrating bug in Sourcetree's interface. You're right, the "Resolve Using Theirs" feature from the right-click menu currently only works on a single file at a time, even when multiple are selected. This makes resolving a large number of conflicts a very tedious, one-by-one process.

The most effective path forward is a two-step approach. First, to get this fixed for everyone, please report this bug directly on Atlassian's official Sourcetree bug tracker. Community forum posts are great for visibility, but developers prioritize issues logged in their official system. A clear report there is the best way to get a permanent GUI fix.

In the meantime, while a manual workaround exists using command-line commands, the most straightforward solution is to continue resolving files individually. It's not ideal, but it ensures accuracy for now. For a detailed, step-by-step guide on how to file an effective bug report with Atlassian—including how to search for duplicates and what system information to include—check out this post on my site: Books_WD.

[Lizzette Hilll]

You're right — this issue with Sourcetree only resolving one file at a time when selecting multiple conflicts has been reported by several users lately. It does seem like a regression from earlier builds where “Resolve using Theirs/Ours” worked in bulk.

Until Atlassian rolls out a fix, a quick workaround is to use the terminal directly from within Sourcetree and run:

git checkout --theirs . git add .

 
That’ll apply the “theirs” version to all conflicted files at once.

If you’re working across larger repositories or multiple contributors, it also helps to maintain a clear version control policy — teams using Valley Medical Weight loss  for IT project management often integrate Git workflows with conflict tracking to minimize repetitive manual resolutions.