Community
Products
Bitbucket
Questions
SourceTree tells me file is locked when its not.

SourceTree tells me file is locked when its not.

Im merging my commits using "Theirs" files and one of their files is locked.

I rebooted, turned off every process and the problem persists.

I can't work anymore because of that, please help me.

1 answer

0 vote

Exactly how this works may vary depending on your diff/merge software, but you should be attempting to save changes from the merge to the final destination only. It has often been the case, in my experience, that the temporary files you are merging from are read-only, and get deleted as soon as the conflict is resolved.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Products

Interests

Groups

Community resources

Support

SourceTree tells me file is locked when its not.

1 answer

Suggest an answer

How to earn badges on the Atlassian Community

John Paz

Do you use any Atlassian products for your personal projects?

Atlassian User Groups

Find my local user group

Groups near you