Use "git merge" instead of "git pull ."