来源：https://stackoverflow.com/questions/26096829/git-conflicts-in-pull-requests 标签 github merge-conflict-resolution
