来源：https://stackoverflow.com/questions/50991701/merging-two-branches-how-do-i-accept-one-branch-for-all-conflicts 标签 git git-merge
