結果 : how to resolve conflicts in git pull request visual studio