584608a14e
Cherry-picked website/, scripts/generate-llms-full.sh, and deploy-docs.yml from joyshmitz's PR. Fixed workflow to trigger on main branch instead of docs/docusaurus-site. Features: - Docusaurus documentation site with llms.txt support - Environment-variable driven config (defaults to steveyegge org) - Automated llms-full.txt generation from docs - GitHub Pages deployment workflow Co-authored-by: joyshmitz <joyshmitz@users.noreply.github.com> 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Executed-By: beads/crew/dave Rig: beads Role: crew
1.2 KiB
1.2 KiB
sidebar_position, title, description
| sidebar_position | title | description |
|---|---|---|
| 3 | Merge Conflicts | Resolve JSONL merge conflicts |
Merge Conflicts Recovery
This runbook helps you resolve JSONL merge conflicts that occur during Git operations.
Symptoms
- Git merge conflicts in
.beads/*.jsonlfiles bd syncfails with conflict errors- Different issue states between clones
Diagnosis
# Check for conflicted files
git status
# Look for conflict markers
grep -l "<<<<<<" .beads/*.jsonl
Solution
:::warning JSONL files are append-only logs. Manual editing requires care. :::
Step 1: Identify conflicted files
git diff --name-only --diff-filter=U
Step 2: For each conflicted JSONL file, keep both versions
# Accept both changes (append-only is safe)
git checkout --ours .beads/issues.jsonl
git add .beads/issues.jsonl
Step 3: Force rebuild to reconcile
bd doctor --fix
Step 4: Verify state
bd list
bd status
Step 5: Complete the merge
git commit -m "Resolved beads merge conflicts"
Prevention
- Sync before and after Git operations
- Use
bd syncregularly - Avoid concurrent modifications from multiple clones