A number of Python projects use a fairly similar way of managing changelogs: https://github.com/hawkowl/towncrier
So does Python itself:
How we solved GitLab's changelog conflict crisis
11–14 of 14 posts
Re: How we solved GitLab's changelog conflict crisis
#12Git supports merge drivers to do things like this: https://git-scm.com/docs/gitattributes#_defining_a_custom_me... Debian has had a merge driver for its changelogs for a while: https://salsa.debian.org/dpkg-team/dpkg/commit/9b98847665d8b...
This!
I get that the article's solution technically does remove a merge collision problem, but this adds other non-automatable™ problems that require giving humans special instructions because of the exceptions to the rule.
Use standard solutions for standard problems people. And dont do a normal merge if you dont want a normal merge. Dont fight the symptoms, look at the cause.
Re: How we solved GitLab's changelog conflict crisis
#13This is akin to database migrations being used to generate the schema in the end. A very Rails-like solution.
Re: How we solved GitLab's changelog conflict crisis
#14Still waiting for them to resolve the "we moved from azure to Google" problem.
"We heard you don't like tech giants hosting your code so we found another tech giant. "