docs(UX): improve daemon and merge documentation (bd-bt6y)

- Clarify bd merge help text: git merge driver, not for duplicate issues
- Add Do I Need the Daemon section to DAEMON.md
- Add daemon overview section to QUICKSTART.md

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-28 23:11:24 -08:00
parent 51db4c8212
commit 9abe99e05a
4 changed files with 144 additions and 78 deletions

View File

@@ -17,12 +17,15 @@ var (
var mergeCmd = &cobra.Command{
Use: "merge <output> <base> <left> <right>",
Short: "3-way merge tool for beads JSONL issue files",
Long: `bd merge is a 3-way merge tool for beads issue tracker JSONL files.
Short: "Git merge driver for beads JSONL files",
Long: `bd merge is a git merge driver for beads issue tracker JSONL files.
It intelligently merges issues based on identity (id + created_at + created_by),
applies field-specific merge rules, combines dependencies, and outputs conflict
markers for unresolvable conflicts.
NOTE: This command is for git merge operations, NOT for merging duplicate issues.
To merge duplicate issues, use 'bd duplicates --auto-merge' instead.
This tool handles 3-way merges during git pull/merge operations. It intelligently
merges issues based on identity (id + created_at + created_by), applies field-specific
merge rules, combines dependencies, and outputs conflict markers for unresolvable conflicts.
Designed to work as a git merge driver. Configure with: