From: Thomas Rast <trast@student.ethz.ch>
To: <Claudia.Ignat@loria.fr>
Cc: <git@vger.kernel.org>
Subject: Re: Octopus merge
Date: Thu, 26 Nov 2009 17:44:52 +0100 [thread overview]
Message-ID: <200911261744.56913.trast@student.ethz.ch> (raw)
In-Reply-To: <4B0EA512.1050001@loria.fr>
Claudia.Ignat@loria.fr wrote:
>
> While I am in the current workspace ws3 I perform the merge
>
> git merge ws4 ws2 ws5
>
> Obviously I obtain conflicts between changes in ws3 and ws2 which I fix
> manually and afterwards I commit the new version of ws3.
In doing that last step, you ignored the crucial bit of advice printed
by the octopus merge:
Automated merge did not work.
Should not be doing an Octopus. # <<--
Merge with strategy octopus failed.
You should simply merge and resolve them separately, not least of all
because in doing so, 'git show $merge' will display your merge
resolutions. An octopus would tangle all resolutions into a single
commit.
AFAIK the only thing that can be considered a bug here is that the
octopus strategy leaves your worktree in need of 'reset --hard'.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2009-11-26 16:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 15:56 Octopus merge Claudia.Ignat
2009-11-26 16:44 ` Thomas Rast [this message]
2009-11-26 16:52 ` Michael J Gruber
2009-12-09 15:10 ` Claudia.Ignat
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=200911261744.56913.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=Claudia.Ignat@loria.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).