News for hackers. Stuff that matters.
Re:How we solved GitLab's changelog conflict crisis by glandium on Tuesday July 03, 2018 @09:34PM (#17454780)
Git 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...

Re:How we solved GitLab's changelog conflict crisis by barrystaes on Wednesday July 04, 2018 @09:10AM (#17457055)
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 by lozenge on Tuesday July 03, 2018 @06:59PM (#17454232)
This solution is neat, but Git also has a very simple built in solution: https://git-scm.com/docs/gitattributes#gitattributes-union
Re:How we solved GitLab's changelog conflict crisis by nettsundere on Tuesday July 03, 2018 @07:30PM (#17454374)
union is bad in general, there is a risk of bad merge
Re:How we solved GitLab's changelog conflict crisis by nettsundere on Tuesday July 03, 2018 @07:35PM (#17454398)
works pretty well until you really need to have similar lines from each branch
Re:How we solved GitLab's changelog conflict crisis by nettsundere on Tuesday July 03, 2018 @07:31PM (#17454379)
Funny thing, i had this idea back in 2015, i even implemented a tool for that,

old blog post: https://medium.com/@nettsundere/on-reducing-changelog-merge-...

Re:How we solved GitLab's changelog conflict crisis by nettsundere on Tuesday July 03, 2018 @07:33PM (#17454391)
Re:How we solved GitLab's changelog conflict crisis by ocharles on Wednesday July 04, 2018 @04:21AM (#17455945)
I imagine just sorting the changelog entries per release (maybe split into sections) would get you quite far, too.
Re:How we solved GitLab's changelog conflict crisis by auscompgeek on Tuesday July 03, 2018 @09:35PM (#17454782)
A number of Python projects use a fairly similar way of managing changelogs: https://github.com/hawkowl/towncrier
Re:How we solved GitLab's changelog conflict crisis by jwilk on Wednesday July 04, 2018 @07:14AM (#17456519)
Re:How we solved GitLab's changelog conflict crisis by amingilani on Wednesday July 04, 2018 @09:42AM (#17457196)
This 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 by robdachshund on Thursday July 05, 2018 @08:24PM (#17468003)
Still 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. "

Re:How we solved GitLab's changelog conflict crisis by joshka on Wednesday July 04, 2018 @05:22AM (#17456144)
TL;DR - ChangeBlog -> MD ;)