From: Jonathan Nieder <jrnieder@gmail.com>
To: Hilco Wijbenga <hilco.wijbenga@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Elijah Newren" <newren@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: Opinions on changing add/add conflict resolution?
Date: Mon, 12 Mar 2018 16:14:19 -0700 [thread overview]
Message-ID: <20180312231419.GA235366@aiede.svl.corp.google.com> (raw)
In-Reply-To: <CAE1pOi3jbLyZ7zgCO5J_BrQurrxZvm5RH+ZjXTTBf4MMmVOduA@mail.gmail.com>
Hi,
Hilco Wijbenga wrote:
> On Mon, Mar 12, 2018 at 2:35 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
>> Interesting. I would be tempted to resolve this inconsistency the
>> other way: by doing a half-hearted two-way merge (e.g. by picking one
>> of the two versions of the colliding file) and marking the path as
>> conflicted in the index. That way it's more similar to edit/edit,
>> too.
>
> If work is going to be done in this area, would it be possible to
> include making auto-merging (in general) optional? Preferably,
> configurable by file (or glob) but I'd already be happy with a global
> setting to opt out.
Have you experimented with the 'merge' attribute (see "git help
attributes")? E.g. you can put
* -merge
in .gitattributes or .git/info/attributes.
If that helps, then a patch adding a pointer to the most helpful place
(maybe git-merge.txt?) would be very welcome.
Thanks and hope that helps,
Jonathan
next prev parent reply other threads:[~2018-03-12 23:14 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 [this message]
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
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=20180312231419.GA235366@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=hilco.wijbenga@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).