Steve Yegge 3c6f83470c feat: Vendor beads-merge 3-way merge algorithm (bd-oif6) ...

- Integrated @neongreen's beads-merge into internal/merge/
- Adapted to use bd's internal/types.Issue instead of custom types
- Added comprehensive tests covering merge scenarios
- Created ATTRIBUTION.md crediting @neongreen
- All tests pass

This solves:
- Multi-workspace deletion sync (bd-hv01)
- Git JSONL merge conflicts
- Field-level intelligent merging

Original: https://github.com/neongreen/mono/tree/main/beads-merge

2025-11-05 18:53:00 -08:00

..

autoimport

…

compact

fix: CI failures - performance thresholds, test eligibility, Nix hash, lint errors

2025-11-03 22:01:37 -08:00

config

Implement auto-routing for bd create (bd-ubu2)

2025-11-04 23:12:42 -08:00

configfile

…

daemon

WIP: WASM port - switch to ncruces/go-sqlite3, add WASM stubs

2025-11-02 22:17:08 -08:00

daemonrunner

…

git

Fix branchExists test after signature change

2025-11-02 20:30:31 -08:00

importer

Doctor sync issues (#231)

2025-11-05 14:25:48 -08:00

merge

feat: Vendor beads-merge 3-way merge algorithm (bd-oif6)

2025-11-05 18:53:00 -08:00

routing

Implement auto-routing for bd create (bd-ubu2)

2025-11-04 23:12:42 -08:00

rpc

Add --parent flag support in daemon mode (bd-2e94)

2025-11-05 13:56:25 -08:00

storage

Skip flaky concurrent test on Windows

2025-11-05 13:56:18 -08:00

syncbranch

…

testutil

Fix lint errors: add error check and gosec suppressions

2025-11-05 01:11:09 -08:00

types

feat: Add ancestor_id field and implement epic/child filtering

2025-11-05 00:44:41 -08:00

utils

Switch from hex to Base36 encoding for issue IDs (GH #213)

2025-11-03 12:02:15 -08:00