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

Reset the index and the head to origin/master, but do not reset the working tree:

git reset origin/master