git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
Cc: Junio C Hamano <gitster@pobox.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: rerere fails to record resolution if file doesn't exist in merge base
Date: Mon, 9 Jul 2007 14:40:14 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0707091438540.5546@racer.site> (raw)
In-Reply-To: <20070709113543.GA12633@informatik.uni-freiburg.de>

Hi,

On Mon, 9 Jul 2007, Uwe Kleine-K?nig wrote:

> Junio C Hamano wrote:
>
> > Not even compile tested, but something like this should do.
> It compiles, but seems not to work.  I will try to make up a test.

I compiled it, and it works as expected.  For safety, git-rerere leaves 
the index unmerged, so that you can verify that you wanted this 
resolution.

Will resubmit with a test case.

Ciao,
Dscho

  reply	other threads:[~2007-07-09 13:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-09  7:07 rerere fails to record resolution if file doesn't exist in merge base Uwe Kleine-König
2007-07-09  8:22 ` Junio C Hamano
2007-07-09 11:35   ` Uwe Kleine-König
2007-07-09 13:40     ` Johannes Schindelin [this message]
2007-07-09 13:47   ` [PATCH] rerere: record resolution even if file is not " Johannes Schindelin
2007-07-09 15:32     ` Uwe Kleine-König

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=Pine.LNX.4.64.0707091438540.5546@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ukleinek@informatik.uni-freiburg.de \
    /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).