Use git fetch + checkout + merge instead of git pull to update the local repo