2013년 4월 18일 목요일 오전 12시 22분 39초 UTC+9, William Seiti Mizuta 님의 말:
> Is commit A a commit or a git init command? In your case, commit A will be
> the BASE if A is really a commit.
Commit A is empty commit but It's not important.
If the case is merge conflict, commit B will be BASE. And common ancestor
will be commit B.
However the case occurred due to cherry-pick.
In this case, I want to know how can I get commitId of BASE.
> William Seiti Mizuta
> Caelum | Ensino e Inovação
> > wrote:
>> 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
>> When a Git cherry-pick generates a merge conflict, there is no common
>> 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
>> For more options, visit https://groups.google.com/groups/opt_out.
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
For more options, visit https://groups.google.com/groups/opt_out.