Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword

On 22.12.20 23:40, Matt Turner wrote:
> tl;dr:
> 
> I want to handle conflicts automatically on lines like
> 
>> KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
> 
> where conflicts frequently happen by adding/removing ~ before the
> architecture names or adding/removing whole architectures. I don't
> know if I should use a custom git merge driver or a custom git merge
> strategy.

You can probably put each of the keywords on a separate line:

KEYWORDS="
~alpha
~amd64
~arm
~arm64
~hppa
~ia64
~mips
~ppc
~ppc64
~riscv
~s390
~sparc~x86
"

The shell should handle both forms about the same.

(I'm not a Gentoo user, just talking about my general shell experience)

Regards
Beat