関連ワード:  git pull creates merge conflict    git pull causes merge conflict    git merge conflict when pulling  
結果 : git pull creates merge conflict