Git merge but take whatever is in remote
If you're running a static analysis tool (or some other automatic tool, like a linter), it can be hard to solve merge conflicts depending on how frequent code updates are. A simple way to always take whatever code is on the remote is running this:
git merge X --theirs origin/master