来源：https://stackoverflow.com/questions/55962141/resolving-a-git-merge-conflict-in-favour-of-ours-or-theirs-without-taking-the-wh 标签 git version-control
