Sometimes, it is necessary to force merge another branch that is known to be the latest source code. This is especially the case where certain files are huge textual, but non-human parseable and therefore a normal git merge is not feasible.
Git merge the branch and prefer the changes within the branch:
git merge -s recursive -X theirs branch