Pull causes conflict need push?

Question

git

This is the situation that arose in the project.
1) Why does this situation arise if I do not make changes at home but work only in branches?
2) How to pull the changes in this case? And I don’t care what I have on my car in the master now - I want to overwrite everything with a new one!

Answer 1

git fetch --all
git reset --hard origin/master