It's not the same without you
Join the community to find out what other Atlassian users are discussing, debating and creating.
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.
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.
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 groupConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.
Start an AUGYou're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.