Steve Yegge
52c505956f
feat: Add bd merge command for git 3-way JSONL merging (bd-omx1)
- Implemented bd merge command with dual-mode operation:
1. Git 3-way merge: bd merge <output> <base> <left> <right>
2. Duplicate issue merge: bd merge <sources...> --into <target> (placeholder)
- Added MergeFiles wrapper to internal/merge package
- Command works without database when used as git merge driver
- Supports --debug flag for verbose output
- Exit code 0 for clean merge, 1 for conflicts
- Handles deletions intelligently (delete-modify conflicts)
- Added proper MIT license attribution for @neongreen's beads-merge code
- Tests pass for git merge functionality
This enables git merge driver setup for .beads/beads.jsonl files.
2025-11-05 19:16:50 -08:00
..
2025-11-02 08:30:31 -08:00
2025-11-03 22:01:37 -08:00
2025-11-04 23:12:42 -08:00
2025-11-02 14:31:22 -08:00
2025-11-02 22:17:08 -08:00
2025-11-02 15:39:00 -08:00
2025-11-02 20:30:31 -08:00
2025-11-05 14:25:48 -08:00
2025-11-05 19:16:50 -08:00
2025-11-04 23:12:42 -08:00
2025-11-05 13:56:25 -08:00
2025-11-05 13:56:18 -08:00
2025-11-02 15:37:57 -08:00
2025-11-05 01:11:09 -08:00
2025-11-05 00:44:41 -08:00
2025-11-03 12:02:15 -08:00