News for hackers. Stuff that matters.
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