How do I force “git pull” to overwrite local files?

Question

How do I force an overwrite of local files on a git pull?

The scenario is the following:

• A team member is modifying the t

Answer 1

I know of a much easier and less painful method:

$ git branch -m [branch_to_force_pull] tmp
$ git fetch
$ git checkout [branch_to_force_pull]
$ git branch -D tmp

That's it!