In a normal Git merge conflict, the three versions of a file in play for 
the three-way merge are roughly as follows:

LOCAL: the version from my branch
REMOTE: the version from the other branch
BASE: the version from the common ancestor of the two branches (in 
particular, the common ancestor of my branch's HEAD and the other branch's 
HEAD)

When a Git cherry-pick generates a merge conflict, there is no common 
ancestor.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to