If you’ve ever tried to do a git pull to get a branch up to date and have run into conflicts that you just want to bypass and go with the contents of the remote branch, do the following:
# Fetch from the default remote of origin. git fetch origin # Check out the branch you want to override the conflicts upon. git checkout master # Reset your current branch of master to origin's master. git reset --hard origin/master
Reference: Stack Overflow: Git pull from remote.. Can I force it to overwrite rather than report conflicts?