git只能两两合并,合并之后生成一个新的commit 然后再合并另外一个 语法:git checkout youWantToKeepBranchgit merge youWantToMergeBranchsharyuke