From: Patrick McLean <chutzpah@gentoo.org>
To: Matt Turner <mattst88@gentoo.org>
Cc: gentoo-dev@lists.gentoo.org, gentoo-dev-announce@lists.gentoo.org
Subject: Re: [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=...
Date: Tue, 2 Mar 2021 13:52:28 -0800 [thread overview]
Message-ID: <20210302135228.6508112b@moya.linuxfreak.ca> (raw)
In-Reply-To: <YD23BVJGjswUlVKG@macbook>
On Mon, 1 Mar 2021 22:54:45 -0500
Matt Turner <mattst88@gentoo.org> wrote:
> tl;dr: In app-portage/gentoolkit-0.5.1 there's a new tool I wrote,
> called merge-driver-ekeyword that can automatically resolve git merge
> conflicts involving the KEYWORDS=... line in ebuilds.
>
> To use the merge driver, configure your gentoo.git as such:
>
> gentoo.git/.git/config:
>
> [merge "keywords"]
> name = KEYWORDS merge driver
> driver = merge-driver-ekeyword %O %A %B %P
>
> gentoo.git/.git/info/attributes:
>
> *.ebuild merge=keywords
>
> With that configured, git merge conflicts on the KEYWORDS=... line will
> be resolved automatically (e.g. during git pull --rebase).
>
Excellent, this will eliminate one source of annoyance with our
workflow. Perhaps we should document this in the wiki:
https://wiki.gentoo.org/wiki/Gentoo_git_workflow
That way new developers, or developers setting up a new machine will
have instructions on setting this up.
next prev parent reply other threads:[~2021-03-02 21:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 3:54 [gentoo-dev] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS= Matt Turner
2021-03-02 5:10 ` Michael Orlitzky
2021-03-02 5:21 ` Sam James
2021-03-02 11:11 ` Wolfgang E. Sanyer
2021-03-02 18:54 ` Matt Turner
2021-03-02 19:02 ` Matt Turner
2021-03-02 19:36 ` Alessandro Barbieri
2021-03-02 19:38 ` Brian Evans
2021-03-02 21:35 ` Matt Turner
2021-03-02 20:12 ` Michael Orlitzky
2021-03-02 21:38 ` Matt Turner
2021-03-02 19:42 ` Michał Górny
2021-03-02 20:16 ` Michael Orlitzky
2021-03-02 21:16 ` Michał Górny
2021-03-03 12:09 ` Ulrich Mueller
2021-03-03 14:18 ` Michael Orlitzky
2021-03-02 21:52 ` Patrick McLean [this message]
2021-03-03 13:57 ` [gentoo-dev] Re: [gentoo-dev-announce] " Sam James
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=20210302135228.6508112b@moya.linuxfreak.ca \
--to=chutzpah@gentoo.org \
--cc=gentoo-dev-announce@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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