From: Jakub Narebski <jnareb@gmail•com>
To: Andreas Ericsson <ae@op5•se>
Cc: Junio C Hamano <gitster@pobox•com>,
Thomas Rast <trast@student•ethz.ch>,
git@vger•kernel.org, Miklos Vajna <vmiklos@frugalware•org>
Subject: Re: [IRC/patches] Failed octopus merge does not clean up
Date: Wed, 17 Sep 2008 10:11:02 +0200 [thread overview]
Message-ID: <200809171011.06714.jnareb@gmail.com> (raw)
In-Reply-To: <48D0A776.1000009@op5.se>
Andreas Ericsson wrote:
> Jakub Narebski wrote:
> > Junio C Hamano wrote:
>>> (1) while it merges other heads one-by-one, it gets conflicts on an
>>> earlier one, before it even attempts to merge all of them. Recording
>>> the heads that it so far attempted to merge in MERGE_HEAD is wrong
>>> (the result won't be an Octopus the end user wanted to carete), and
>>> recording all the heads the user gave in MERGE_HEAD is even more
>>> wrong (it hasn't even looked at the later heads yet, so there is no
>>> way for the index or work tree to contain anything from them).
>>>
>>> The above is hitting this case.
[...]
>> BTW. does it mean that "git merge a b" might be not the same as
>> "git merge b a"?
>>
>
> No. Git merges all the sub-things together and then merges the result
> of that jumble into the branch you're on.
>
> Someone might have to correct me on that, but that's as far as I've
> understood it.
>From what I understand from above explanation, and from thread on git
mailing list about better implementation of and documenting finding
merge bases for multiple heads, I think octopus merge is done by merging
[reduced] heads one by one into given branch.
This means that "git merge a b" does internally "git merge a; git merge b"
as I understand it.
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2008-09-17 8:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 22:48 [IRC/patches] Failed octopus merge does not clean up Thomas Rast
2008-09-15 22:49 ` [PATCH] Add test that checks octopus merge cleanup Thomas Rast
2008-09-15 22:49 ` [PATCH] Documentation: warn against merging in a dirty tree Thomas Rast
2008-09-15 23:42 ` Junio C Hamano
2008-09-15 23:53 ` Avery Pennarun
2008-09-16 0:06 ` Junio C Hamano
2008-09-18 15:15 ` Linus Torvalds
2008-09-18 18:18 ` Avery Pennarun
2008-09-19 20:28 ` Junio C Hamano
2008-09-15 23:36 ` [IRC/patches] Failed octopus merge does not clean up Junio C Hamano
2008-09-15 23:47 ` Thomas Rast
2008-09-16 0:20 ` Junio C Hamano
2008-09-16 22:53 ` Jakub Narebski
2008-09-17 6:45 ` Andreas Ericsson
2008-09-17 8:11 ` Jakub Narebski [this message]
2008-09-17 15:59 ` Miklos Vajna
2008-09-17 16:40 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200809171011.06714.jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=ae@op5$(echo .)se \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=trast@student$(echo .)ethz.ch \
--cc=vmiklos@frugalware$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox