関連ワード:  git config pull merge strategy    git config pull rebase false merge the default strategy    hint git config pull rebase false merge the default strategy    git merge conflict when pulling    git merge conflict example  
結果 : git config pull merge strategy