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.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.