The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

SourceTree tells me file is locked when its not.

fuck atlassian
Contributor
July 3, 2014

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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

Post a new question

0 votes
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Champions.
July 3, 2014

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.

TAGS
AUG Leaders

Atlassian Community Events