Hi,
Using git 1.5.4.5, I notice that the result from git merge and git commit
are different in an unexpected way.
Take the following tree:
B---C---D---E2
/
-A1
\
F---G---H---I3
(letters represent commits, numbers represent where the references are).
Your current head is '1', and you want to merge branches '2' and '3', so
you use:
git merge 2 3
If there aren't any conflicts, you get a nice clean merge, resulting in:
B---C---D---E2
/ \
-A J1
\ /
F---G---H---I3
However, if you have a conflict that needs resolving, you fix it up as
normal, and then use git commit. This results in:
B---C---D---E2
/ \
-A---------------K1
\ /
F---G---H---I3
instead - an additional reference from commit 'K' back to commit 'A'
which isn't present in the clean merge case.
Is this intentional, or is it a bug?
--
Russell King
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
