来源:https://stackoverflow.com/questions/47835297/resolve-merge-conflict-only-for-some-files-and-commit-to-branch-for-other-teams 标签 git git-pull merge-conflict-resolution