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

An easier way would be to:

git checkout --theirs /path/to/file.extension
git pull origin master

This will override your local file with the file on git