From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Cc: git@vger.kernel.org
Subject: Re: git rerere and diff3
Date: Tue, 26 Jun 2018 12:05:01 -0700 [thread overview]
Message-ID: <xmqq1sctl676.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAP71WjzHffLRCDbjvF7qpexjXDMFcJkaPpEn=AtbSMCJd6QkBQ@mail.gmail.com> (Nicolas Dechesne's message of "Tue, 26 Jun 2018 15:25:28 +0200")
Nicolas Dechesne <nicolas.dechesne@linaro.org> writes:
> i have noticed that merge.conflictstyle has an impact on the rerere
> resolution. looking briefly at the source code, it seems that git
> tries to discard the common ancestor diff3 bits, but what I am seeing
> is that if i do the following then it fails:
>
> 1. from a clean rr-cache state, with merge.conflictsytle=diff3, git
> merge <branch with conflict>, resolve the conflicts, then commit
> 2. undo the previous merge, remove merge.conflictstyle=diff3 (disable
> diff3) and merge the *same* branch, then rerere won't fix the
> conflicts
It is possible that the conflict left when making the same merge are
actually different when using these two conflict styles. IOW, if
the merge produces
<<<
side A
|||
common
===
side B
>>>
when diff3 style is chosen, but if the same merge results in
<<<
side A'
===
side B'
>>>
where side A' is not identical to side A (or B' and B are not
identical), then we will fail to find the previously recorded
resolution.
next prev parent reply other threads:[~2018-06-26 19:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 13:25 git rerere and diff3 Nicolas Dechesne
2018-06-26 19:05 ` Junio C Hamano [this message]
2018-06-26 19:37 ` Nicolas Dechesne
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1sctl676.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nicolas.dechesne@linaro.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).