On Tue, 2021-03-02 at 00:10 -0500, Michael Orlitzky wrote: > On Mon, 2021-03-01 at 22:54 -0500, Matt Turner 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. > > > > Since the KEYWORDS=... assignment is a single line, > > Is that enforced? If not, will the merge driver handle other formats > correctly? And if it is... why don't we just enforce putting each > keyword on a separate line instead, so that we don't have this problem > in the first place?
Are you volunteering to fix all the tools to support the new format correctly? -- Best regards, Michał Górny
