関連ワード:  git pull default merge strategy    default git merge strategy    different git merge strategies    git merge conflict when pulling  
結果 : git pull default merge strategy