有什么复杂的: 我想复制最后提交从“dev”分支到“主”分支。从一个分支git副本提交到另一个
我这样做
git checkout master
git cherry-pick a6b9463bec0a5240f6e945fbf4951c932751f28d
,我得到一个错误:
git cherry-pick a6b9463bec0a5240f6e945fbf4951c932751f28d
error: could not apply a6b9463... releasing v1.00
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'
git status
给
$ git status
# On branch master
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
#
# Unmerged paths:
# (use "git add <file>..." to mark resolution)
#
# both modified: index.html
# both modified: js/boardDims.js
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# config.xml.orig
no changes added to commit (use "git add" and/or "git commit -a")
我不明白为什么它是复杂的复制COMIT到另一个分支。 你可以给我命令将这个提交复制到我的主分支吗?
感谢
您是否尝试解决冲突? (提示:'git mergetool') – dug 2014-10-28 20:18:33
是的,但我不明白是什么弹出:有3个文件... – Louis 2014-10-28 20:21:12
不要把它看作3个文件,它基本上是一个文件在3个状态(commit1,commit2 ,解决后) – 2014-10-28 20:22:16