関連ワード:  github pull request resolve conflicts    github pull request merge conflicts    github desktop pull request merge conflicts    github pull request resolve merge conflict    resolve pull request conflicts github desktop    github resolve conflicts not working    resolve conflicts github command line  
結果 : github pull request resolve conflicts