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

20
examples/team-workflow/README.md
View File

@@ -244,20 +244,20 @@ Hash-based IDs prevent most conflicts. If conflicts occur:
```bash
# During git pull/merge
git pull origin beads-metadata
# CONFLICT in .beads/beads.jsonl
# CONFLICT in .beads/issues.jsonl
# Option 1: Accept remote
git checkout --theirs .beads/beads.jsonl
bd import -i .beads/beads.jsonl
git checkout --theirs .beads/issues.jsonl
bd import -i .beads/issues.jsonl
# Option 2: Accept local
git checkout --ours .beads/beads.jsonl
bd import -i .beads/beads.jsonl
git checkout --ours .beads/issues.jsonl
bd import -i .beads/issues.jsonl
# Option 3: Use beads-merge tool (recommended)
# See docs/GIT_INTEGRATION.md for merge conflict resolution
git add .beads/beads.jsonl
git add .beads/issues.jsonl
git commit
```
@@ -299,7 +299,7 @@ git commit
### Q: How do team members see each other's issues?
A: Issues are stored in `.beads/beads.jsonl` which is version-controlled. Pull from git to sync.
A: Issues are stored in `.beads/issues.jsonl` which is version-controlled. Pull from git to sync.
```bash
git pull
@@ -372,9 +372,9 @@ bd daemon --start --auto-commit --auto-push
Use beads-merge or resolve manually (see [GIT_INTEGRATION.md](../../docs/GIT_INTEGRATION.md)):
```bash
git checkout --theirs .beads/beads.jsonl
bd import -i .beads/beads.jsonl
git add .beads/beads.jsonl
git checkout --theirs .beads/issues.jsonl
bd import -i .beads/issues.jsonl
git add .beads/issues.jsonl
git commit
```