nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Could not update one or more files

Myron

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.

Accepted answers

All comments

otabekbt

same issue can't do anything

MarkAtQ5X

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.

MarkAtQ5X

Otabek, did you find a solution or workaround?

Jim_z2jimd

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.

Simon Stevenson_6rusc2

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.

Luca Trapasso

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

Tommo

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.

Manoj Kumar_cgr8b0

Before trying to resolve merge conflicts 'using theirs' or 'using mine', execute this comment in git bash.

rm -f .git/index.lock

After that we can able to resolve conflicts in stash

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

jira

bitbucket