Handling ChangeLog / RelNews / News file conflict

Posted Jun 9, 2016 11:22 UTC (Thu) by jnareb (subscriber, #46500)
Parent article: Python's GitHub migration and workflow changes

> How to handle the misc/News file, which carries little blurbs about features and changes in the release, needs to be determined. If each contributor changes it on their branch, that will just lead to merge conflicts. It could be handled automatically by deriving the entry from the commit message or that file could be split up into individual-entry files and reassembled at release time.

Or use / create a specialized contents merge strategy for this file, via `merge` gitattribute and custom merge driver; I know there is one specialized merge driver for files in GNU ChangeLog format (git-merge-changelog from gnulib), and for debian/changes (git-merge-dch / dpkg-mergechangelogs from dpkg-dev).