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