I have no local changes to a particular file:
Yet when I try to check it in, I’m told there is a conflict.
When I try Auto-Merge, I get the following error:
When I try “Resolve…” nothing happens (I see a dialog box briefly appear then disappear)
So:
• I can’t revert the file
• I can’t auto-merge it
• I can’t resolve it
What do I do here?
Regards,
Paul
Git: file can't be reverted or resolved
Re: Git: file can't be reverted or resolved
BUMP
A question 6 years old, and still a problem in 2019. I'd rather not have to delete my local every time
A question 6 years old, and still a problem in 2019. I'd rather not have to delete my local every time
Re: Git: file can't be reverted or resolved
Any solution to this. I am facing the same issue and right now I cannot pull the latest version of the file from Central.