From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Raman Gupta <rocketraman@gmail.com>, git@vger.kernel.org
Subject: Re: [RFC] Git rerere and non-conflicting changes during conflict resolution
Date: Tue, 25 Jul 2017 13:40:59 -0700 [thread overview]
Message-ID: <xmqqk22wuu5g.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqo9s8uuth.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 25 Jul 2017 13:26:34 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> To populate the database, we'd need a reverse.
> ...
> * Then the user tells Git that semantic conflicts were resolved and
> need to be recorded (just like running "git rerere" manually,
> before "git commit" automatically does it for them these days).
> This will result in the following:
>
> - The database is updated so that key <A, B> yields the
> "merge-fix" commit;
> ...
I probably should have been aiming for stars, as I were outlining
the ideal merge-fix logic. The key <A, B> is merely a default, and
the worst one at that. There should be a way for the user to tell
which exact pair of commits (i.e. another side branch that was
merged earlier to the mainline A that renamed 'xyzzy' to 'frotz'
wholesale, and the exact commit on the side branch B that added an
extra mention of 'xyzzy').
If the logic can figure out what these two commits are without
user's help, mechanically by only looking at the merge-fix commit,
that would be even better. But I do not believe in miracles, so...
next prev parent reply other threads:[~2017-07-25 20:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 15:09 [RFC] Git rerere and non-conflicting changes during conflict resolution Raman Gupta
2017-07-25 17:52 ` Jeff King
2017-07-25 19:54 ` Raman Gupta
2017-07-25 20:25 ` Jeff King
2017-07-25 20:26 ` Junio C Hamano
2017-07-25 20:40 ` Junio C Hamano [this message]
2017-07-25 20:58 ` Jeff King
2017-07-26 7:14 ` Junio C Hamano
2017-07-27 21:01 ` Junio C Hamano
2017-07-26 8:06 ` 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
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=xmqqk22wuu5g.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=rocketraman@gmail.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.
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).