Re:What is a logical merge conflict?
by public_void on Thursday July 07, 2022 @03:10PM
(#32018016)
Everywhere I've ever worked has built and maintained their own solution for this. Seems a bit silly, like maintaining your own CMS or something.
[ Parent
| on HN ]
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.