Vendor beads-merge by @neongreen for native bd merge command

- Vendored beads-merge algorithm into internal/merge/ with full MIT license attribution
- Created bd merge command as native wrapper (no external binary needed)
- Updated bd init to auto-configure git merge driver (both interactive and --quiet)
- Removed obsolete test files that were incompatible with vendored version
- Added merge to noDbCommands list so it can run standalone
- Tested: successful merge and conflict detection work correctly

Closes bd-bzfy

Thanks to @neongreen for permission to vendor!
See: https://github.com/neongreen/mono/issues/240
Original: https://github.com/neongreen/mono/tree/main/beads-merge

Amp-Thread-ID: https://ampcode.com/threads/T-f0fe7c4c-13e7-486b-b073-fc64b81eeb4b
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
2025-11-06 15:38:48 -08:00
parent d4c97d9f70
commit dcb6eb27a8
7 changed files with 310 additions and 1026 deletions

View File

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- **Vendored beads-merge by @neongreen** (bd-bzfy): Native `bd merge` command for intelligent JSONL merging
- Vendored beads-merge algorithm into `internal/merge/` with full attribution and MIT license
- New `bd merge` command as native wrapper (no external binary needed)
- Same field-level 3-way merge algorithm, now built into bd
- Auto-configured during `bd init` (both interactive and `--quiet` modes)
- Thanks to @neongreen for permission to vendor: https://github.com/neongreen/mono/issues/240
- Original tool: https://github.com/neongreen/mono/tree/main/beads-merge
- **Git Hook Version Detection** (bd-iou5, 991c624): `bd info` now detects outdated git hooks
- Adds version markers to all git hook templates (pre-commit, post-merge, pre-push)
- Warns when installed hooks are outdated or missing