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

Merge GH#409

Browse Source
This commit is contained in:
Steve Yegge
2025-12-16 01:19:07 -08:00
parent 22e63fb128 166d66205c
commit dedfc43d1f
17 changed files with 9685 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/ADVANCED.md
View File

@@ -231,16 +231,16 @@ The conflicts you'll encounter are **git merge conflicts** in the JSONL file whe
**Resolution:**
```bash
# After git merge creates conflict
git checkout --theirs .beads/beads.jsonl # Accept remote version
git checkout --theirs .beads/issues.jsonl # Accept remote version
# OR
git checkout --ours .beads/beads.jsonl # Keep local version
git checkout --ours .beads/issues.jsonl # Keep local version
# OR manually resolve in editor (keep line with newer updated_at)
# Import the resolved JSONL
bd import -i .beads/beads.jsonl
bd import -i .beads/issues.jsonl
# Commit the merge
git add .beads/beads.jsonl
git add .beads/issues.jsonl
git commit
```