関連ワード:  git pull set merge strategy    different git merge strategies  
結果 : git pull set merge strategy