関連ワード:  git pull request merge conflict edited in both    git pull causes merge conflict  
結果 : git pull request merge conflict edited in both