Git Pull está por delante de X Commit
git checkout <branch_name>
git pull -s recursive -X theirs
git reset --hard origin/<branch_name>
git fetch
Biplove Giri
git checkout <branch_name>
git pull -s recursive -X theirs
git reset --hard origin/<branch_name>
git fetch