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

There are no comments on this comment yet.