結果 : git resolve merge conflicts before pull request