From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [not even design notes yet] teaching rerere to remember removal?
Date: Fri, 19 May 2023 09:51:29 +0200 [thread overview]
Message-ID: <ZGcqgR5RimHJiwFv@ugly> (raw)
In-Reply-To: <xmqq353ts2qt.fsf@gitster.g>
On Thu, May 18, 2023 at 03:18:02PM -0700, Junio C Hamano wrote:
>So I am wondering what should be used as the record of "if the other
>branch made this change, we have seen this conflict already, and we
>know it is safe to resolve it to remove the path".
>
i suppose i may be missing the obvious, but why not just treat the
removal as a full diff (like a traditional patch would do) and remember
the resolution accordingly like any other conflict?
the key to making this useful is presenting followup conflicts in a
sensible way that highlights where they actually are, but that would be
useful regardless - i often run into this while rebasing, where finding
that one line that i added to a bigger section that was (re-)moved
requires so much attention that i instead look at the original patch
rather than the conflict to see what it was. (note that i'm using diff3
markers.)
regards,
ossi
prev parent reply other threads:[~2023-05-19 7:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 22:18 [not even design notes yet] teaching rerere to remember removal? Junio C Hamano
2023-05-19 7:51 ` Oswald Buddenhagen [this message]
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=ZGcqgR5RimHJiwFv@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).