Tools & IDEs
Bug Report
A merge conflict resolution silently dropped a teammate's security fix
A fix for an input validation bug was merged, confirmed in production, and two weeks later the bug was back. Nobody had reverted it. A long-running branch was merged with a conflict, and the resolution kept the old side. How we found the lost lines with git log, why the merge diff hid it and the habits that prevent it.