関連ワード:  git pull automatic merge commit    git pull automatic merge failed fix conflicts and then commit the result    pull and merge difference    git merge without commit history  
結果 : git pull automatic merge commit