関連ワード:  git pull without auto merge    git pull no auto merge    git pull auto merge    git pull auto merge conflict    git pull automatic merge failed fix conflicts and then commit the result    git pull automatic merge failed    does git pull automatically merge    does git pull pull all branches