How to git pull and overwrite file conflicts

I use git for version control. One of the biggest conveniences for me is running “git pull” to download the latest commits. But sometimes, the git pull fails because of a file that changed on the server. That’s usually my fault.

So here’s how to go about pulling from Read more…