How to force a pull to a file in git?
I am having a merge conflict, and I can usually just rename the file and pull from the repo ti resolve or manually edit the edit. This time, I committed changes to a file that has conflicts, and it is in the staging area.
I tried using `git reset HEAD <file>`and then using `git pull` again, but I still get merge conflicts.
Is there a way to force the overwrite of the troublesome file?
Thanks.
How to force a pull to a file in git?
===

I am having a merge conflict, and I can usually just rename the file and pull from the repo ti resolve or manually edit the edit. This time, I committed changes to a file that has conflicts, and it is in the staging area.
I tried using `git reset HEAD <file>`and then using `git pull` again, but I still get merge conflicts.
Is there a way to force the overwrite of the troublesome file?
Thanks.