From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: "Curtin\, Eric" <Eric.Curtin@dell.com>,
Christian Couder <christian.couder@gmail.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>, "Geary\,
Niall" <Niall.Geary@dell.com>, "rowlands\,
scott" <Scott.Rowlands@dell.com>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: Collaborative conflict resolution feature request
Date: Sat, 13 Jun 2020 09:44:30 -0700 [thread overview]
Message-ID: <xmqqmu56zzip.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <432b9e0b-eedf-6d39-ebc0-0416f8574afc@iee.email> (Philip Oakley's message of "Sat, 13 Jun 2020 14:14:32 +0100")
Philip Oakley <philipoakley@iee.email> writes:
> Maybe have a parallel 'merge' branch that is used (say weekly) to do
> trial merges and will essentially record the conflict resolutions while
> they are fresh in folks memories. That branch is distinct from, either
> of the two main branches, but will act as a filter and a hand rail to
> highlight future difficulties."
An aside that probably would not directly help Eric, but I know the
above workflow helps reasonably well. The 'pu' branch is rebuilt
not on top of 'next', but is rebuilt with all topics (including
those already in 'next') in flight directly on top of 'master',
which serves as a way to anticipate conflicts that will require
resolution in the future before the topics can enter 'next' branch.
And these resolutions are ...
> Also look at 'rerere'.
... remembered in the rerere database (and even trickier ones that
rerere cannot handle are recorded in the merge-fix commits, but that
is a separate story). When topics are ready to be merged to 'next'
and to 'master', the correct resolutions are likely to be known and
the result tested in 'pu' and 'next', respectively, for some time
already.
next prev parent reply other threads:[~2020-06-13 16:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 14:08 Collaborative conflict resolution feature request Curtin, Eric
2020-06-13 11:33 ` Johannes Sixt
2020-06-13 12:08 ` Christian Couder
2020-06-13 12:38 ` Curtin, Eric
2020-06-13 13:14 ` Philip Oakley
2020-06-13 16:44 ` Junio C Hamano [this message]
2020-06-15 9:51 ` Sergey Organov
2020-06-15 11:04 ` Philip Oakley
2020-06-16 17:17 ` Stefan Moch
2020-06-17 18:32 ` Curtin, Eric
2020-06-17 21:17 ` Sergey Organov
2020-06-13 17:10 ` Christian Couder
2020-06-13 19:22 ` Junio C Hamano
2020-06-13 19:34 ` Junio C Hamano
2020-06-14 11:05 ` Philip Oakley
2020-06-14 13:00 ` Konstantin Tokarev
2020-06-15 9:28 ` Curtin, Eric
2020-06-15 11:31 ` Philip Oakley
2020-06-15 16:57 ` Junio C Hamano
2020-06-15 17:32 ` Chris Torek
2020-06-16 15:56 ` Chris Torek
2020-06-15 19:37 ` Philip Oakley
2020-06-17 18:30 ` Junio C Hamano
2020-06-18 8:11 ` demerphq
2020-06-18 8:53 ` Curtin, Eric
2020-06-18 9:28 ` Curtin, Eric
2020-06-18 10:14 ` demerphq
2020-06-19 9:17 ` Curtin, Eric
2020-06-20 16:09 ` Christian Couder
2020-06-21 0:20 ` Curtin, Eric
2020-06-16 9:08 ` Christian Couder
2020-06-15 12:55 ` Sergey Organov
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=xmqqmu56zzip.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Eric.Curtin@dell.com \
--cc=Niall.Geary@dell.com \
--cc=Scott.Rowlands@dell.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=philipoakley@iee.email \
/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).