Hacker News new | ask | show | jobs
by djhaskin987 1436 days 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.
1 comments
mattmatheson 1436 days ago
> 2. Run unit/integration/regression tests on PRs?

The blog walks through the situation where tests against a PR won't catch this.

link
djhaskin987 1435 days ago
It actually says that the test will catch it hours later and that the assertion will fail?

The contrived example would only ever happen if the developers in question didn't talk to each other. A lack of coordination is the real problem and cannot be solved by tooling. You can never tool your way out of a communication problem.

link