I'm trying to resolve merge conflicts 'using theirs' but it keeps returning the error:
"Could not update one or more files, please check that no other application is locking your files."
Eventhough all other programs are closed and not using the files it returns this error.
I can try and resolve them one by one but this will take forever because there are more then 70 merge conflict items.
I'm using the latest sourcetree version 188.8.131.52.
Running Windows 10 Home
Any help would be appreciated.
Using SourceTree 184.108.40.206 / Windows 7
Same root problem here, restarted machine checked status of files (they were not locked by another process or marked as read only)
The only way I was able to resolve is to use TortoiseGet and resolve "Using mine'
Of course SourceTree lost the mergeconflix message that was previously nicely populated in my window. Overall I'm very disappointed in SourceTree, very slow performance, locks regularly, and provides unfortunate situations like this on a monthly basis. These tools should be rock and not require me to look for other solutions/workarounds for core functionality.
And this bug is still relevant in October 2021. Sourcetree still claims a file is locked when we try to merge resolution "theirs" for a deleted file.
No, Atlassian programmers! The folder was deleted, the file is not locked! That's why you were able to resolve the other 5 deleted files in the same folder as deleted.
Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events