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 18.104.22.168.
Running Windows 10 Home
Any help would be appreciated.
Using SourceTree 22.214.171.124 / 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.
Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs