News for hackers. Stuff that matters.
Re:What is a logical merge conflict? by mattmatheson on Thursday July 07, 2022 @03:50PM (#32018490)
> 2. Run unit/integration/regression tests on PRs?

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

Re:What is a logical merge conflict? by djhaskin987 on Friday July 08, 2022 @12:37AM (#32023241)
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.