結果 : git resolve pull request conflicts locally