From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Opinions on changing add/add conflict resolution?
Date: Tue, 13 Mar 2018 16:30:15 -0700 [thread overview]
Message-ID: <CAPc5daUC+6cHpexXTO24p4mG_5eL1JmxrYm8h3UfdTh_FMka=w@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BE=D_TgjLZkhRh6-7k3UpnDDMfZB6vE=FMdwFT+mmp_tw@mail.gmail.com>
On Tue, Mar 13, 2018 at 4:14 PM, Elijah Newren <newren@gmail.com> wrote:
>
> Someone in the future might hate us if they use conflictstyle=diff3,
> and have a recursive merge,
FWIW I already always use diff3 style and see the nested markers,
and I already hate it, so you are no worse off ;-)
next prev parent reply other threads:[~2018-03-13 23:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 18:32 Opinions on changing add/add conflict resolution? Elijah Newren
2018-03-12 18:47 ` Jonathan Nieder
2018-03-12 21:26 ` Elijah Newren
2018-03-12 21:35 ` Jonathan Nieder
2018-03-12 23:08 ` Hilco Wijbenga
2018-03-12 23:14 ` Jonathan Nieder
2018-03-13 0:38 ` Elijah Newren
2018-03-13 17:22 ` Elijah Newren
2018-03-13 5:30 ` Junio C Hamano
2018-03-13 18:21 ` Elijah Newren
2018-03-13 22:26 ` Junio C Hamano
2018-03-13 22:42 ` Elijah Newren
2018-03-13 22:52 ` Junio C Hamano
2018-03-13 23:04 ` Elijah Newren
2018-03-13 22:56 ` Jonathan Nieder
2018-03-13 23:14 ` Elijah Newren
2018-03-13 23:30 ` Junio C Hamano [this message]
2018-03-12 22:19 ` Ævar Arnfjörð Bjarmason
[not found] ` <CABPp-BHDOimDoLxWxS=BDOBkm6CUTrXTzD16=TSkWGN-HOiU2g@mail.gmail.com>
2018-03-13 2:53 ` Fwd: " Elijah Newren
2018-03-13 22:12 ` Junio C Hamano
2018-03-13 9:59 ` Ævar Arnfjörð Bjarmason
2018-03-13 17:09 ` Elijah Newren
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='CAPc5daUC+6cHpexXTO24p4mG_5eL1JmxrYm8h3UfdTh_FMka=w@mail.gmail.com' \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=newren@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).