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