> 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.