From: Junio C Hamano <gitster@pobox•com>
To: Thomas Rast <trast@student•ethz.ch>
Cc: git@vger•kernel.org, Miklos Vajna <vmiklos@frugalware•org>,
Jakub Narebski <jnareb@gmail•com>
Subject: Re: [IRC/patches] Failed octopus merge does not clean up
Date: Mon, 15 Sep 2008 16:36:55 -0700 [thread overview]
Message-ID: <7v63ox9e20.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200809160048.31443.trast@student.ethz.ch> (Thomas Rast's message of "Tue, 16 Sep 2008 00:48:19 +0200")
Thomas Rast <trast@student•ethz.ch> writes:
> The merge says
>
> Trying simple merge with 5b3e4bb1c2d88d6967fb575729fbfc86df5eaec9
> Simple merge did not work, trying automatic merge.
> Auto-merging foo
> ERROR: Merge conflict in foo
> fatal: merge program failed
> Automated merge did not work.
> Should not be doing an Octopus.
> Merge with strategy octopus failed.
>
> So far so good. However, 'git status' claims
> ... This behaviour is
> identical for 1.5.6 and 1.6.0.2, so it is not caused by the merge
> rewrite as a builtin. Shouldn't it either really clean up, or really
> leave the repo in a conflicted merge state? (I'm following up with a
> patch that turns the above into a test. Octopus doesn't really have
> many tests, does it?)
Your analysis is correct --- this has been the correct/established
behaviour of Octopus from day one.
Read the second from the last line of what you were told by git. Run "git
reset --hard" after that, perhaps.
next prev parent reply other threads:[~2008-09-15 23:38 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 ` Junio C Hamano [this message]
2008-09-15 23:47 ` [IRC/patches] Failed octopus merge does not clean up 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
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=7v63ox9e20.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(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