From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Philip Oakley <philipoakley@iee.org>
Cc: "Git List" <git@vger.kernel.org>,
"Torsten Bögershausen" <tboegi@web.de>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: How to exchange rerere/redo resolutions?
Date: Tue, 14 May 2019 10:21:06 +0200 [thread overview]
Message-ID: <87mujpwiod.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <d139d79a-f35a-e00c-3790-104146b066c7@iee.org>
On Tue, May 14 2019, Philip Oakley wrote:
> Hi All,
>
> On 10/05/2019 15:59, Philip Oakley wrote:
>>> You can publish your merged branch somewhere, and others can use
>>> contrib/rerere-train.sh to learn from the resolution.
>>>
>>> Supposedly, I've never actually used it...
>
> Does the contrib/rerere-train.sh actually work? I'm reading the code
> to ensure I understand what rerere/redo is doing, and in the training
> it tries to detect MERGE_RR via L87
>
> if test -s "$GIT_DIR/MERGE_RR"
>
> It's not clear if that is an internal implementation detail, or a
> mistaken use of a historic path name. Can anyone enlighten me?
Historic? No, this is path.c now on master:
path.c:1454:REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR")
Internal, sure. We don't document it so it could change in theory, but
then we'd probably change rerere-train.sh along with it...
>> The tricky part is when the patch series doesn't apply so the
>> conflict isn't yet on any branch..
> When copying patches across to Git for Windows, the conflict
> resolution can be tricky.
next prev parent reply other threads:[~2019-05-14 8:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-09 23:23 How to exchange rerere/redo resolutions? Philip Oakley
2019-05-09 23:49 ` Ævar Arnfjörð Bjarmason
2019-05-10 14:59 ` Philip Oakley
2019-05-13 22:24 ` Philip Oakley
2019-05-13 22:46 ` Junio C Hamano
2019-05-14 8:21 ` Ævar Arnfjörð Bjarmason [this message]
2019-05-14 23:11 ` Philip Oakley
2019-05-15 1:12 ` Junio C Hamano
2019-05-10 14:05 ` Torsten Bögershausen
2019-05-10 15:10 ` Philip Oakley
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=87mujpwiod.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.org \
--cc=tboegi@web.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.