Could not update one or more files

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 2.1.2.5.
Running Windows 10 Home

 

Any help would be appreciated.

4 answers

For me it seems like this happened with the "theirs" change being a delete, so "resolving using theirs" should delete the file. I worked around it by marking the files as resolved then deleting them manually.

Also in my case was because of a deleted file. Your comment was helpful, thanks!

Using SourceTree 2.1.11.0 / 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. 

same issue can't do anything

Otabek, did you find a solution or workaround?

Same issue using 2.3.1.0 on Windows 7.

Perhaps this will help find the problem...

On all the files that I tried to "Resolve using theirs", I tried using "Resolve using mine" and I did not get the error.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

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 ...

692 views 5 9
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you