How to make Git merge always pick up theirs changes in case of conflict?

Question

git

Git got me sick. Some strange merge conflicts suddenly started on the server. With each such conflict, merge marks simply destroy the server.
Are there options in Git's configuration that would force it, on every pull, if a merge conflict suddenly arises, ALWAYS resolve it only towards the new version (theirs parameter when manually merging) ?

Answer 1

If commits are made on your server, then:
If they don’t, but just the files change and then they don’t allow you to do a normal git pull, then:

git reset --hard HEAD
git pull