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