From: Beat Bolli <dev+git@drbeat.li>
To: Matt Turner <mattst88@gentoo.org>, gentoo-portage-dev@lists.gentoo.org
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword
Date: Wed, 23 Dec 2020 19:11:38 +0100 [thread overview]
Message-ID: <b2adb41b-b2d2-fecf-3a93-7eb3f1f2247d@drbeat.li> (raw)
In-Reply-To: <CAEdQ38E9Fepp9gmidcf_HvFMacwPZBr0XgPT5HFs8bHw-SJDZQ@mail.gmail.com>
On 22.12.20 23:40, Matt Turner wrote:
> tl;dr:
>
> I want to handle conflicts automatically on lines like
>
>> KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
>
> where conflicts frequently happen by adding/removing ~ before the
> architecture names or adding/removing whole architectures. I don't
> know if I should use a custom git merge driver or a custom git merge
> strategy.
You can probably put each of the keywords on a separate line:
KEYWORDS="
~alpha
~amd64
~arm
~arm64
~hppa
~ia64
~mips
~ppc
~ppc64
~riscv
~s390
~sparc~x86
"
The shell should handle both forms about the same.
(I'm not a Gentoo user, just talking about my general shell experience)
Regards
Beat
next prev parent reply other threads:[~2020-12-23 18:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201221034452.307153-1-mattst88@gentoo.org>
2020-12-22 22:40 ` [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword Matt Turner
2020-12-23 18:11 ` Beat Bolli [this message]
2020-12-23 19:46 ` Junio C Hamano
2020-12-23 19:45 ` Junio C Hamano
2020-12-24 4:47 ` Matt Turner
2020-12-24 6:13 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b2adb41b-b2d2-fecf-3a93-7eb3f1f2247d@drbeat.li \
--to=dev+git@drbeat.li \
--cc=gentoo-portage-dev@lists.gentoo.org \
--cc=git@vger.kernel.org \
--cc=mattst88@gentoo.org \
/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 NNTP newsgroup(s).