ReleaseNotes.txt and merge conflicts

[Lubomir I. Ivanov]

On 28 November 2017 at 00:45, Dirk Hohndel <dirk at hohndel.org> wrote:
>
> On Nov 27, 2017, at 2:19 PM, Lubomir I. Ivanov <neolit123 at gmail.com> wrote:
>
> hello,
>
> maybe we can think of a mechanic to avoid the release note conflicts,
> as these are more common now that everyone edits the file next to a
> pull request.
>
> Currently, if they are 2 pending pull-requests at Github and one of
> them gets merged there is a good change that this will create a merge
> conflict for the second PR that also touches the notes.
>
> i wonder if there is a way to stage / schedule a release note and
> something else can merge it later that would be best.
>
> i was thinking about using Google docs to collaborate on a "latest
> release notes changes" document, but that requires invites and someone
> has to commit them manually in the end.
>
>
> 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.

thanks for the link.
lubomir
--