Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Bug during merge

Jens Odborg May 2, 2025

If I select several files that conflict then right click and select resolve using mine. One of two errors happens:

case 1: when all files are in different folders only the first are resolved even though I was asked to confirm them all

case 2: when some files are in same folder I get an error (after confirmation) that a file fails because it is open by another application even though this was not the case, and no files are resolved. (I suspect that the other application was started by SourceTree) 

1 answer

0 votes
Brant Schroeder
Community Champion
November 21, 2025

@Jens Odborg Are you merging to a local repo?  Where is the repo stored?

 

Jens Odborg November 25, 2025

This was on Windows 10 with repo stored on c:\git\gitlab\... I tried to reproduce but was unable but I am now on Windows 11 and on a newer SourceTree version

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events