在自己的分支查看想要合并的节点的commit id :
Git log —oneline -3 //查看最新的三个提交 commit id
切换到总分支：
Git fetch
Git pull
Git cherry-pick (最新提交的commit id)
error: could not apply 7eb8213... list main
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
qydeMacBook-Pro:proname qy$ git status
On branch test_all
Your branch is up to date with 'origin/test_all'.
You are currently cherry-picking commit 7eb8213.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: src/index.vue
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/utils.js
解决src/utils.js中的冲突
解决冲突完成
Git add .
Git cherry-pick —continue
Git push