| 1 |
Git diff has --color-word, doesn't this suggest that it has the capability |
| 2 |
of identifying these word-by-word changes? |
| 3 |
|
| 4 |
Is there perhaps a merge option that is being overlooked? |
| 5 |
|
| 6 |
El mar., 2 de marzo de 2021 12:21 a. m., Sam James <sam@g.o> |
| 7 |
escribió: |
| 8 |
|
| 9 |
> |
| 10 |
> > On 2 Mar 2021, at 05:10, Michael Orlitzky <mjo@g.o> wrote: |
| 11 |
> > |
| 12 |
> > On Mon, 2021-03-01 at 22:54 -0500, Matt Turner wrote: |
| 13 |
> >> tl;dr: In app-portage/gentoolkit-0.5.1 there's a new tool I wrote, |
| 14 |
> >> called merge-driver-ekeyword that can automatically resolve git merge |
| 15 |
> >> conflicts involving the KEYWORDS=... line in ebuilds. |
| 16 |
> >> |
| 17 |
> >> Since the KEYWORDS=... assignment is a single line, |
| 18 |
> > |
| 19 |
> > Is that enforced? If not, will the merge driver handle other formats |
| 20 |
> > correctly? And if it is... why don't we just enforce putting each |
| 21 |
> > keyword on a separate line instead, so that we don't have this problem |
| 22 |
> > in the first place? |
| 23 |
> |
| 24 |
> Yeah, it’s policy: |
| 25 |
> https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105. |
| 26 |
> |
| 27 |
> I also removed all of the trivial infringers not long ago: |
| 28 |
> https://github.com/gentoo/gentoo/pull/19467. There |
| 29 |
> aren’t many left. |
| 30 |
> |
| 31 |
> Anyway, yes, the format is still a pain because diff doesn’t handle it |
| 32 |
> well. But I don’t really want |
| 33 |
> to see ebuilds become longer... |
| 34 |
> |
| 35 |
> sam |
| 36 |
> |
| 37 |
> |
Archives