From: "Uwe Kleine-König" <ukleinek@informatik.uni-freiburg.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] rerere: record resolution even if file is not in merge base
Date: Mon, 9 Jul 2007 17:32:09 +0200 [thread overview]
Message-ID: <20070709153209.GA19665@informatik.uni-freiburg.de> (raw)
In-Reply-To: <Pine.LNX.4.64.0707091445450.5546@racer.site>
Hello Johannes, hello Junio,
Johannes Schindelin wrote:
> Two-file merges were rare enough that they were dropped outside of the
> radar. This fix is a trivial change to builtin-rerere.c::find_conflict().
> It is still sane to insist that we do not do rerere for symlinks, and
> require to have stages #2 and #3, but we can drop the requirement to have
> stage #1. rerere does not use information from there anyway.
>
> This fix is from Junio, together with two tests to verify that it works
> as expected.
>
> Noticed by Uwe Kleine-König.
when I tested Junio's patch and wrote that it doesn't work, I was wrong.
I just recompiled git-rerere and called that instead of the installed
version. The problem there was, that merge didn't called the updated.
So:
Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
--
Uwe Kleine-König
http://www.google.com/search?q=1+hertz+in+sec**-1
prev parent reply other threads:[~2007-07-09 15:32 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
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 [this message]
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=20070709153209.GA19665@informatik.uni-freiburg.de \
--to=ukleinek@informatik.uni-freiburg.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).