Files
beads/cmd/bd
Steve Yegge 5ad1c80f7e fix(merge): proper 3-way merge for dependencies - removals win (bd-ndye)
CRITICAL: Fixed dependency resurrection bug that caused removed/orphaned
dependencies to keep coming back after sync.

Root cause: mergeDependencies() was doing a union (additive only) and
completely ignored the base parameter. This meant any dependency present
in either left or right would be included, even if it was intentionally
removed.

Fix: Proper 3-way merge where REMOVALS ARE AUTHORITATIVE:
- If dep was in base and removed by left OR right → stays removed
- If dep wasn't in base and added by left OR right → included
- If dep was in base and both still have it → included

This fixes months of issues with orphaned parent-child relationships
being resurrected during git sync operations.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-18 23:20:49 -08:00
..
2025-12-16 17:26:06 -08:00
2025-12-16 01:17:25 -08:00
2025-12-16 01:17:25 -08:00
2025-12-07 20:57:58 +11:00
2025-12-16 17:50:25 -08:00
2025-11-24 21:16:44 -08:00
2025-11-24 11:28:32 -08:00
2025-12-18 22:46:14 -08:00