Steve Yegge 7f13623683 feat(merge): auto-resolve all field conflicts deterministically (bd-6l8) ...

Implement deterministic auto-resolve rules for all merge conflicts:
- Title/Description: side with latest updated_at wins
- Notes: concatenate both sides with separator
- Priority: higher priority wins (lower number)
- IssueType: local (left) wins
- Status: closed wins (existing)

Also fixed bug in isTimeAfter where invalid t1 incorrectly beat valid t2.

Removed unused conflict generation code (hasConflict, makeConflict,
makeConflictWithBase, issuesEqual, cmp import).

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

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

2025-12-02 20:52:07 -08:00

..

autoimport

refactor: rename last_import_hash to jsonl_content_hash (bd-39o)

2025-11-28 23:14:12 -08:00

beads

feat: add .beads/redirect file support for workspace redirection

2025-11-30 19:23:30 -08:00

compact

…

config

test: improve coverage for config and git packages

2025-11-28 21:56:52 -08:00

configfile

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -08:00

daemon

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

2025-11-27 14:22:42 -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

…

git

test: improve coverage for config and git packages

2025-11-28 21:56:52 -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): auto-resolve all field conflicts deterministically (bd-6l8)

2025-12-02 20:52:07 -08:00

routing

…

rpc

feat(ready): add --unassigned filter for bd ready

2025-11-30 00:38:57 -08:00

storage

fix(db): remove redundant GetCloseReason() calls (bd-bbh)

2025-12-01 22:06:08 -08:00

syncbranch

fix(sync): handle diverged histories with content-based merge (bd-3s8)

2025-12-02 18:25:56 -08:00

testutil

…

types

feat: add --unassigned flag to bd ready command

2025-11-30 00:37:12 -08:00

util

…

utils

fix: ExtractIssuePrefix now handles 3-char base36 hashes (#425)

2025-11-30 20:50:56 -08:00

validation

…