From: Junio C Hamano <gitster@pobox.com>
To: Michal Sojka <sojkam1@fel.cvut.cz>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Bug: failed octopus merge does not create MERGE_HEAD
Date: Sat, 13 Mar 2010 12:52:51 -0800 [thread overview]
Message-ID: <7vr5no7xlo.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1268402835-12992-1-git-send-email-sojkam1@fel.cvut.cz
Hmm.
When it detects conflicts, and refuses to make a merge, the octopus
backend says "should not be doing an octopus". As far as I can tell,
MERGE_HEAD is useful only when resolving conflicts, and the octopus
strongly discourages recording anything but the simplest conflict-free
merges. That makes me think that not writing the file out would be the
more correct thing to do.
One possibility I can think of is that we try to prevent user mistakes by
checking the existence of MERGE_HEAD (i.e. "can't do this, you are still
during a merge"), and not writing MERGE_HEAD in this case, but still
potentially leaving the index unmerged, may allow some operations that we
should prevent from being invoked to proceed. Is that the issue you are
trying to address? Or is there something else? Why do you want to have
MERGE_HEAD?
next prev parent reply other threads:[~2010-03-13 20:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 14:07 [PATCH] Bug: failed octopus merge does not create MERGE_HEAD Michal Sojka
2010-03-13 20:52 ` Junio C Hamano [this message]
2010-03-14 19:24 ` Michal Sojka
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=7vr5no7xlo.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sojkam1@fel.cvut.cz \
/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).