関連ワード:  git resolve pull request merge conflict    git fix pull request merge conflict    github pull request resolve merge conflict    git pull request merge conflict resolution extension    git resolve merge conflicts before pull request  
結果 : git resolve pull request merge conflict