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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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