Steve Yegge 975443e08b feat(merge): add tombstone support for 3-way merge (bd-0ih) ...

Implements tombstone merge semantics per design in bd-zvg:
- Add tombstone fields to merge.Issue struct (deleted_at, deleted_by, etc.)
- Add IsTombstone() and IsExpiredTombstone() helper functions
- Implement tombstone-wins-unless-expired logic
- Add tombstone vs tombstone merge (later deleted_at wins)
- Add merge3WayWithTTL() for configurable TTL
- Update mergeStatus() to handle tombstone status as safety measure

Merge rule summary:
| Left      | Right     | Condition   | Result                |
|-----------|-----------|-------------|-----------------------|
| Live      | Tombstone | Not expired | Tombstone             |
| Live      | Tombstone | Expired     | Live (resurrection)   |
| Tombstone | Live      | Not expired | Tombstone             |
| Tombstone | Live      | Expired     | Live (resurrection)   |
| Tombstone | Tombstone | -           | Later deleted_at wins |

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

Co-Authored-By: Claude <noreply@anthropic.com>

2025-12-05 16:33:49 -08:00

..

autoimport

fix: NixOS symlink compatibility for mtime and permission checks (#459)

2025-12-05 13:22:09 -08:00

beads

test: replace manual os.Chdir with t.Chdir in tests (#457)

2025-12-04 11:21:43 -08:00

compact

Fix test compilation errors: add context.Background() to sqlite.New() calls

2025-11-21 14:57:18 -05:00

config

test: replace manual os.Chdir with t.Chdir in tests (#457)

2025-12-04 11:21:43 -08:00

configfile

feat: change deletions TTL default from 7 to 3 days

2025-12-03 22:44:59 -08:00

daemon

feat(doctor): add --dry-run flag and fix registry parsing (bd-qn5, bd-a5z)

2025-12-03 00:09:25 -08:00

debug

feat: Complete command set standardization (bd-au0)

2025-11-23 20:33:31 -08:00

deletions

fix: CI test failures on Windows

2025-11-26 20:59:07 -08:00

export

Add configurable export error handling policies (bd-exug)

2025-11-23 20:21:51 -08:00

git

fix(sync): merge instead of overwrite in SyncJSONLToWorktree (bd-52q)

2025-12-05 14:33:34 -08:00

importer

fix: add safety guard to prevent git-history-backfill mass deletion (bd-t5m)

2025-11-30 21:26:16 -08:00

lockfile

fix(daemon): add cross-process locking to registry (bd-5bj)

2025-11-27 14:22:42 -08:00

merge

feat(merge): add tombstone support for 3-way merge (bd-0ih)

2025-12-05 16:33:49 -08:00

routing

…

rpc

test: replace manual os.Chdir with t.Chdir in tests (#457)

2025-12-04 11:21:43 -08:00

storage

feat(tombstone): implement delete-to-tombstone and TTL expiration (bd-3b4, bd-olt)

2025-12-05 16:20:43 -08:00

syncbranch

fix: resolve CI lint errors and Windows test timeout

2025-12-03 17:50:23 -08:00

testutil

Fix test compilation errors: add context.Background() to sqlite.New() calls

2025-11-21 14:57:18 -05:00

types

feat(tombstone): implement delete-to-tombstone and TTL expiration (bd-3b4, bd-olt)

2025-12-05 16:20:43 -08:00

util

…

utils

fix: accept 3-char all-letter base36 hashes in ExtractIssuePrefix (#446)

2025-12-02 23:00:24 -08:00

validation

Refactor: Extract duplicated validation logic to internal/validation

2025-11-20 20:39:23 -05:00