来源：https://stackoverflow.com/questions/59622140/git-merge-vs-git-rebase-for-merge-conflict-scenarios 标签 git git-merge git-merge-conflict
