Collaboration
Resolving a CLAUDE.md Merge Conflict: Rules vs. Facts
Why a CLAUDE.md merge conflict isn't just a diff problem, and the simple split between rules and facts that keeps it from happening again.
12 October 2026 · 7 min readPractical notes on AI-assisted coding: what to keep beside your code, how to write project memory an assistant can use, and how to share the whole picture with the people you work with.
Tagged #merge-conflicts. Clear