[gentoo-dev] Re: [gentoo-dev-announce] New tool: merge-driver-ekeyword automatically resolves git merge conflicts involving KEYWORDS=...

[Sam James]

> On 2 Mar 2021, at 03:54, Matt Turner <mattst88@g.o> 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.
>

Thanks a lot for your work here, Matt! It’s something that’s
proven genuinely helpful in day-to-day work and solves
an actual problem during arch testing.

This is a great improvement on the status quo and obviously this isn’t
the place to bikeshed over the ebuild format.

> [snip]

Best,
Sam