docs: Enhance beads-merge documentation with setup instructions

Browse Source

- Add detailed installation steps for Git and Jujutsu users
- Explain 3-way merge algorithm and field-level merging
- Document configuration in .gitattributes and .jjconfig.toml
- Clarify how it prevents conflicts proactively vs resolving after
- Created bd-bzfy to track integration of beads-merge tool

...

This commit is contained in:

Steve Yegge

2025-11-05 11:32:22 -08:00

parent 187c395e3e

commit 527e491216

2 changed files with 116 additions and 89 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

162

.beads/beads.jsonl

File diff suppressed because one or more lines are too long