From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Johannes Sixt <j6t@kdbg.org>, Seth House <seth@eseth.com>
Subject: Re: [PATCH v3] mergetool: add automerge configuration
Date: Fri, 18 Dec 2020 02:34:23 -0800 [thread overview]
Message-ID: <xmqqwnxftnbk.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: 5fdc16b8de8c1_f2faf208ad@natae.notmuch
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Right, althought the user can't configure otherwise, and the default 7,
> it can't hurt to add it.
Yes, that would make it certain that the code would survive the
change in the underlying xmerge part of the system.
I am still not sure what the right plan to deal with conflicts
recorded in the virtual ancestor. Do we just close our eyes and
ignore it?
An easy way out may be to give an command line override so that
users can easily re-run mergetool with the feature disabled only for
a single invocation that went wrong, which would make it less likely
that users disable the feature permanently upon seeing just one case
of the new logic getting confused.
next prev parent reply other threads:[~2020-12-18 10:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 5:45 [PATCH v3] mergetool: add automerge configuration Felipe Contreras
2020-12-17 7:37 ` Johannes Sixt
2020-12-17 8:31 ` Felipe Contreras
2020-12-18 0:47 ` Junio C Hamano
2020-12-18 2:40 ` Felipe Contreras
2020-12-18 10:34 ` Junio C Hamano [this message]
2020-12-18 12:13 ` Felipe Contreras
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=xmqqwnxftnbk.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=seth@eseth.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).