関連ワード:  git pull merge strategy config    git merge conflict when pulling    git what causes merge conflicts  
結果 : git pull merge strategy config