Hello
case is follows:
commit A : initial empty commit
commit B : modified a.txt
commit C : modified a.txt
commit D : add b.txt
commit E : modified a.txt
E <-- master
|
D
|
C
|
B <-- foo_branch
|
A
I'm in foo_branch.
If I do "git cherry-pick commit-E" then BASE will be commit C. (B will b
William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br
On Wed, Apr 17, 2013 at 5:10 AM, seonguk.baek wrote:
> Hello
>
> case is follows:
>
> commit A : initial empty commit
> commit B : modified a.txt
> commit C : modified a.txt
> commit D : add b.txt
> commit E : modi
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 m
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.
William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br
On Wed, Apr 17, 2013 at 5:21 AM, seonguk.baek wrote:
> In a normal Git merge conflict, the three versio
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 com
