Re: More help needed on merging unrelated repos

From: Christian MICHON <christian.michon@gmail.com>
Date: Nov 4, 2008, 22:30 UTC
Message-ID: <46d6db660811041430l74d9a100kc15ac46dea8ff63f@mail.gmail.com>
In-Reply-To: <4910C6F4.5010407@op5.se>

On Tue, Nov 4, 2008 at 11:04 PM, Andreas Ericsson <ae@op5.se> wrote:

Show 6 quoted lines

> Ah, right. Octopus merge always does merge head reduction, but to do
> that it needs to find a common ancestor. When no such ancestor exists,
> it will fail (with a message like "shouldn't be doing octopus merge"?).
>
> If there's no "--no-reduce-heads" option to "git merge", I think you're
> screwed with getting that to happen in a single commit.

:(

Show 8 quoted lines

>
> Oh wait.
>
> git merge i1 && git merge --no-commit i2 && git commit --amend
>
> might work. I'm still shooting from the hip though, and now it's far too
> late for me to think more. gl though.
>

it's late for me too!

$ git merge i1/master
Merge made by recursive.
 a |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 a

$ git merge --no-commit i2/master Automatic merge went well; stopped before committing as requested

$ git commit --amend fatal: You are in the middle of a merge -- cannot amend.

note the merge can work, but it's still done in 2 steps. :( thanks for suggesting this.

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !