From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH 2/2 - RFH/WIP] xdiff-merge: optionally show conflicts in "diff3 -m" style
Date: Sun, 31 Aug 2008 11:42:10 -0700 [thread overview]
Message-ID: <7vd4jp2fi5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0808311021120.12958@nehalem.linux-foundation.org> (Linus Torvalds's message of "Sun, 31 Aug 2008 10:38:18 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Sun, 31 Aug 2008, Junio C Hamano wrote:
>> ...
>> My observation so far suggests that it would be best for me to leave the
>> configuration "merge.conflictstyle" to the default "merge", and instead
>> give an option to allow me to tell "git checkout -m -- $path" (which is
>> also a new feature; it overwrites the $path by the result of a fresh merge
>> to reproduce the conflicted state in the working tree, using the three
>> stages recorded in the index) to use "diff3 -m" style, when I want to.
>
> Now *this* I think is a great idea!
>
> The reason I think it's a great idea is that it solves so many _different_
> issues (which is the mark of a really good solution):
> ...
> - it fixes another totally unrelated problem: incorrect merge
> resolutions.
I do not know if rerere often kicks in in your workflow, but occasionally
I notice that I have a faulty merge recorded by it, which automatically is
applied again when reproducing a merge. And it makes me deeply regret
that I invented the rerere mechanism.
The best solution for this issue I found so far is embarrasingly clumsy.
Run "ls -tl .git/rr-cache" to find the newest one with "thisimage", make
sure it is the right one, remove the directory and redo the merge.
Actually, the feature of "git checkout -m -- $path" to reproduce the merge
for the named path was conceived to address this "I cannot easily correct
the faulty resolution that was re-applied" issue.
next prev parent reply other threads:[~2008-08-31 18:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-29 0:09 [PATCH 1/2] xdl_fill_merge_buffer(): separate out a too deeply nested function Junio C Hamano
2008-08-29 0:18 ` [PATCH 2/2 - RFH/WIP] xdiff-merge: optionally show conflicts in "diff3 -m" style Junio C Hamano
2008-08-29 0:34 ` Linus Torvalds
2008-08-29 1:07 ` Junio C Hamano
2008-08-31 7:10 ` Junio C Hamano
2008-08-31 17:38 ` Linus Torvalds
2008-08-31 18:42 ` Junio C Hamano [this message]
2008-08-29 6:27 ` Junio C Hamano
2008-08-29 9:01 ` Junio C Hamano
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=7vd4jp2fi5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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).