| 1 |
On Tue, 2021-03-02 at 00:10 -0500, Michael Orlitzky wrote: |
| 2 |
> On Mon, 2021-03-01 at 22:54 -0500, Matt Turner wrote: |
| 3 |
> > tl;dr: In app-portage/gentoolkit-0.5.1 there's a new tool I wrote, |
| 4 |
> > called merge-driver-ekeyword that can automatically resolve git merge |
| 5 |
> > conflicts involving the KEYWORDS=... line in ebuilds. |
| 6 |
> > |
| 7 |
> > Since the KEYWORDS=... assignment is a single line, |
| 8 |
> |
| 9 |
> Is that enforced? If not, will the merge driver handle other formats |
| 10 |
> correctly? And if it is... why don't we just enforce putting each |
| 11 |
> keyword on a separate line instead, so that we don't have this problem |
| 12 |
> in the first place? |
| 13 |
|
| 14 |
Are you volunteering to fix all the tools to support the new format |
| 15 |
correctly? |
| 16 |
|
| 17 |
-- |
| 18 |
Best regards, |
| 19 |
Michał Górny |
Archives