git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Tapsell <johnflux@gmail.com>
To: Clemens Buchacher <drizzd@aon.at>
Cc: git@vger.kernel.org, Dave Olszewski <cxreg@pobox.com>
Subject: Re: [PATCH] refuse to merge during a merge
Date: Thu, 28 May 2009 17:12:40 +0100	[thread overview]
Message-ID: <43d8ce650905280912q71c749bn7146210a5838a453@mail.gmail.com> (raw)
In-Reply-To: <20090527210410.GA14742@localhost>

> +       if (read_cache_unmerged() || file_exists(git_path("MERGE_HEAD")))
>                die("You are in the middle of a conflicted merge.");

Could the error message also give possible solutions?   "Commit the
current merge first with 'git commit', or discard the current merge
attempt with 'git reset --hard'" or something.  Or at least a pointer
to where to read for more info.

John

  parent reply	other threads:[~2009-05-28 16:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-27 21:04 [PATCH] refuse to merge during a merge Clemens Buchacher
2009-05-28 16:00 ` Constantine Plotnikov
2009-05-28 16:12 ` John Tapsell [this message]
2009-05-30  8:37   ` Clemens Buchacher
2009-05-30 10:38     ` Jakub Narebski
2009-05-30 10:57       ` Thomas Rast
2009-05-31 10:43     ` Clemens Buchacher
2009-05-31 11:05       ` John Tapsell
2009-05-31 14:05         ` Clemens Buchacher
2009-05-31 19:36       ` Junio C Hamano
2009-06-01  9:20         ` [PATCH v3] " Clemens Buchacher

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=43d8ce650905280912q71c749bn7146210a5838a453@mail.gmail.com \
    --to=johnflux@gmail.com \
    --cc=cxreg@pobox.com \
    --cc=drizzd@aon.at \
    --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).