Git replace local with remote version

Question

How can I tell git to ignore my local file and take the one from my remote branch without trying to merge and causing conflicts?

Answer 1

For this question try:

git stash

git checkout origin/master

If you need to include the remote changes in the master branch you can do:

git reset --hard origin/master

This will make your branch "master" to point to "origin/master".