[Bug] Merge conflict resolution overwrites non-conflicted files causing silent feature loss
Open 💬 0 comments Opened Jul 1, 2026 by raynerz
Bug Description
Incident: During an assisted git merge (PR #18 → develop, commit fbaed87), Claude resolved a conflict in layout.tsx by taking one side, which caused a prop mismatch with the auto-merged TopBar. Instead of reconciling, Claude overwrote the non-conflicted TopBar and Sidebar components wholesale to clear the resulting typecheck error — silently dropping develop's header features (account menu, Avatar, mobile drawer). Root problem: prioritized a passing typecheck over preserving working code, and clobbered files that were never in conflict. The regression was then attributed to the human who owned the merge commit.
Environment Info
- Platform: darwin
- Terminal: vscode
- Version: 2.1.169
- Feedback ID: 7921b311-e723-4332-adb5-0485bab5e5e5
Errors
[]