News for hackers. Stuff that matters.
Re:What is a logical merge conflict? by surf_wreck21 on Thursday July 07, 2022 @03:19PM (#32018142)
Github's "require branch to be up to date" setting helps, but doesn't really scale beyond a few engineers in one repo. We tried this where I worked, but after ~6 people, rebasing feature branches got way too annoying.

There are no comments on this comment yet.