johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: update Jujutsu integration to use bd merge (GH#906)

Browse Source 
- Remove standalone beads-merge binary section (no longer maintained)
- Update Jujutsu config to use `bd merge` instead of `beads-merge`
- Fix config path to standard `~/.config/jj/config.toml`
- Add note that tool only works for .beads/issues.jsonl

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
fang
2026-01-12 16:34:11 -08:00
committed by Steve Yegge
parent 279192c5fb
commit 7eab16715f
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
docs/GIT_INTEGRATION.md
View File

@@ -197,37 +197,24 @@ During `git merge`, beads-merge:
- Merges dependency/label changes intelligently - Merges dependency/label changes intelligently
- Only conflicts on true semantic conflicts - Only conflicts on true semantic conflicts
### Alternative: Standalone beads-merge Binary
**If you prefer the standalone binary (same algorithm):**
```bash
# Install (requires Go 1.24+)
git clone https://github.com/neongreen/mono.git
cd mono/beads-merge
go install
# Configure Git merge driver
git config merge.beads.name "JSONL merge driver for beads"
git config merge.beads.driver "beads-merge %A %O %A %B"
```
### Jujutsu Integration ### Jujutsu Integration
**For Jujutsu users**, add to `~/.jjconfig.toml`: **For Jujutsu users**, add to `~/.config/jj/config.toml`:
```toml ```toml
[merge-tools.beads-merge] [merge-tools.beads-merge]
program = "beads-merge" program = "bd"
merge-args = ["$output", "$base", "$left", "$right"] merge-args = ["merge", "$output", "$base", "$left", "$right"]
merge-conflict-exit-codes = [1] merge-conflict-exit-codes = [1]
``` ```
Then resolve with: Then resolve with:
```bash ```bash
jj resolve --tool=beads-merge jj resolve --tool=beads-merge .beads/issues.jsonl
``` ```
**Note:** This only works for `.beads/issues.jsonl` since `bd merge` is a specialized JSONL merge tool.
## Protected Branch Workflows ## Protected Branch Workflows
**If your repository uses protected branches** (GitHub, GitLab, etc.), bd can commit to a separate branch instead of `main`: **If your repository uses protected branches** (GitHub, GitLab, etc.), bd can commit to a separate branch instead of `main`: