git checkout <branch_name> git pull -s recursive -X theirs git reset --hard origin/<branch_name> git fetch