関連ワード:  github desktop pull request merge conflicts    git merge conflict when pulling    how to resolve merge conflicts in github desktop  
結果 : github desktop pull request merge conflicts