I've gotten into some state with Git, and now I can't sync with Master.
The idea below is to abandon any changes I have locally for conflicts and use what's in Master. Unfortunately, Git won't allow me to do that. I've tried deleting the files and following Git's instructions to git rm XXX
on the offending files. It even fails after a git reset --hard HEAD
.
How do I force Git to take the remote's copy of files?