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