関連ワード:  git pull auto merge conflict    git pull automatic merge failed fix conflicts and then commit the result    git merge conflict when pulling    git pull causes merge conflict  
結果 : git pull auto merge conflict