From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Lars Schneider <larsxschneider@gmail.com>,
git <git@vger.kernel.org>, Jeff King <peff@peff.net>,
me@ttaylorr.com
Subject: Re: Merge conflicts in .gitattributes can cause trouble
Date: Mon, 17 Oct 2016 10:51:49 -0700 [thread overview]
Message-ID: <xmqqvawqvp6y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1610171803400.197091@virtualbox> (Johannes Schindelin's message of "Mon, 17 Oct 2016 18:11:00 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I would vote for:
>
> 4. We keep letting Git read in the *current* version of .gitattributes
> *before* the merge, and apply those attributes while performing the
> merge.
Even though this needs a major surgery to the way the attr subsystem
reads from these files, I think it is conceptually the cleanest.
next prev parent reply other threads:[~2016-10-17 17:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-04 10:19 Merge conflicts in .gitattributes can cause trouble Lars Schneider
2016-10-04 11:26 ` Duy Nguyen
2016-10-17 16:11 ` Johannes Schindelin
2016-10-17 17:51 ` Junio C Hamano [this message]
2016-10-18 12:39 ` Johannes Schindelin
2016-10-18 17:30 ` 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=xmqqvawqvp6y.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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).