ReleaseNotes.txt and merge conflicts

[Lubomir I. Ivanov]

On 28 November 2017 at 02:42, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
> On 28 November 2017 at 02:07, Thiago Macieira <thiago at macieira.org> wrote:
>> On Monday, 27 November 2017 15:18:19 PST Lubomir I. Ivanov wrote:
>>> > Isn’t this what we are looking for:
>>> >
>>> > http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
>>>
>>> i think, yes. that's exactly what we are looking for.
>>> i wonder if it would work with the current ReleaseNotes.txt layout
>>> where lines are inserted at the bottom of a new release and on top of
>>> old ones. i guess i can test it.
>>
>> Since we're using GitHub itself to do the merges, can you confirm that it does
>> respect this .gitattributes attribute?
>>
>
> i've just tried it a couple of times and it seems that it doesn't
> support the `merge=union` attribute.
> the github UI still gives "Can’t automatically merge".
>

i wrote that too fast,

it seems that it doesn't like the layout of our ReleaseNotes or maybe
it's something more specific.
i got "merge=union" working with github when adding text at the top of
the same file from two different merges / PRs.

will investigate more.

lubomir
--