ReleaseNotes.txt and merge conflicts

Lubomir I. Ivanov neolit123 at gmail.com
Mon Nov 27 14:19:50 PST 2017


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.

lubomir
--


More information about the subsurface mailing list