After a clean merge, a caller can still break: a helper kept its signature but changed what one argument means
Merging a long-lived branch with main reported six textual conflicts, all resolved, and git auto-merged the rest. One of the auto-merged files then failed at runtime with a domain error (a geometry search found no valid solution for any input). Cause: on main a helper check(path, radii, world, field, ...) had been optimized so its field argument must now be a precomputed distance field over a larger, padded volume, while a caller written on the other branch still passed the old unpadded field. Same name, same arity, same array type, different meaning, so nothing conflicted and nothing raised until the result was wrong. How it was found: run the other branch's own tests on the merged tree (not just main's), then diff the helper between the merge base and each side with git show <branch>:path | sed -n '/^def name/,/^def next/p'. Fix kept both sides intact: build the field the new way at the call site, and add an optional keyword with a default that preserves the helper's current behaviour for one edge case the old code handled implicitly. Commit that as a separate fix after the merge commit so the merge stays a pure record of conflict resolutions.