Merging is a deceptively complex problem dressed up as a simple one. The way your version control handles something as common as “combine these two sets of changes” varies greatly due to the design assumptions baked in. Both P4 and Git solve parts of it well. Neither replaces human judgment.
For semiconductor design teams coordinating RTL, firmware, and verification with multiple AI-assisted contributors, that merge wall shows up even faster. The stakes are higher and the effects can ripple across the entire design pipeline.
Full piece linked below.
If you’re running more than a few AI coding agents against the same repository with Claude Code, Cursor agents, Copilot agent mode, or whatever your stack is, you’ve probably felt the friction. Branches that won’t rebase cleanly. Two agents independently inventing error_handler.cpp and error_manager.cpp for the same job. Force pushes that orphan another agent’s work. A constant background hum of merge conflicts that no one quite owns.
This isn’t a problem with your agents. It’s a problem with the assumptions baked into the version control system you have working underneath them.
One example: Suppose two agents working in parallel both add code in the same place, and the merge deduplicates that line. The textual merge succeeds but the behavior is wrong. There is no conflict marker, and the CI may pass if the test isn’t precise. Whether anyone catches it later depends entirely on what your version control preserved about how the file got that way. Git's history is rewritable by design (rebase, squash, force-push); P4's integration records aren't. That one difference cascades.
Full Disclosure: Yes, we’re Perforce, but this technical deep dive provides an honest look at what’s actually happening under the hood of your VCS: three-way merges, mutual inserts, directory-level conflicts, the DAG and how Git uses it, integration records and how P4 uses them. We work through two real merge scenarios in depth and see where each system’s design assumptions hold and where they don’t.
Read the breakdown: https://ter.li/znm31uy7