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