top | item 32017965 What is a logical merge conflict? 6 points| mattmatheson | 3 years ago |blog.trunk.io 5 comments order hn newest djhaskin987|3 years ago > The industry solution to this problem is adding a merge service in the loop to protect your main branch from these harder-to-find conflicts.Or maybe just:1. Catch this during code review?2. Run unit/integration/regression tests on PRs?This just feels like another post from a vendor who wants to "sell you a DevOps" when proper culture and process is probably the better answer. mattmatheson|3 years ago > 2. Run unit/integration/regression tests on PRs?The blog walks through the situation where tests against a PR won't catch this. load replies (1) shill8690|3 years ago [deleted] public_void|3 years ago 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. surf_wreck21|3 years ago 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.
djhaskin987|3 years ago > The industry solution to this problem is adding a merge service in the loop to protect your main branch from these harder-to-find conflicts.Or maybe just:1. Catch this during code review?2. Run unit/integration/regression tests on PRs?This just feels like another post from a vendor who wants to "sell you a DevOps" when proper culture and process is probably the better answer. mattmatheson|3 years ago > 2. Run unit/integration/regression tests on PRs?The blog walks through the situation where tests against a PR won't catch this. load replies (1) shill8690|3 years ago [deleted]
mattmatheson|3 years ago > 2. Run unit/integration/regression tests on PRs?The blog walks through the situation where tests against a PR won't catch this. load replies (1)
public_void|3 years ago 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. surf_wreck21|3 years ago 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.
surf_wreck21|3 years ago 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.
djhaskin987|3 years ago
Or maybe just:
1. Catch this during code review?
2. Run unit/integration/regression tests on PRs?
This just feels like another post from a vendor who wants to "sell you a DevOps" when proper culture and process is probably the better answer.
mattmatheson|3 years ago
The blog walks through the situation where tests against a PR won't catch this.
shill8690|3 years ago
[deleted]
public_void|3 years ago
surf_wreck21|3 years ago