beads/docs
Steve Yegge f97fd4a8b5 fix(dolt): detect Dolt ancestor-PK merge refusals and print bootstrap-canonical-clone recovery (bd-6dnrw.1)
Dolt refuses outright to merge a table whose primary key set differs
across the merging heads or in their common ancestor ("cannot merge
because table X has different primary keys [in its common ancestor]").
The refusal fires before any row conflicts materialize, so the pull
auto-resolver never runs and retrying can never converge the clones —
the residual #4259 hazard for v1.0.4 -> v1.0.6 upgrades with un-synced
dependency edits straddling the 0041/0043/0050 PK reshape.

bd dolt pull/push (and auto-push) now recognize this error class and
print the bootstrap-from-one-canonical-clone recipe (force-push the
canonical clone, export/re-clone/import everywhere else) instead of
just the raw error. Full playbook added as docs/RECOVERY.md#pk-fork-refused,
plus an Unreleased upgrade note: sync every clone before upgrading and
pull immediately after the designated migrator pushes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-09 23:41:19 -04:00
..
adr fix(init): refuse --force when remote has Dolt history (#3455) 2026-04-24 09:01:35 -07:00
design Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
staged-for-removal Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
ADAPTIVE_IDS.md feat: support issue_id_mode=counter for sequential IDs (#2013) 2026-02-22 23:49:46 -08:00
ADO_CONFIG.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
ADVANCED.md docs: fix broken xref to docs/EXTENDING.md in extension example (#3713) 2026-05-05 13:18:43 -07:00
AIDER_INTEGRATION.md Document supported go install modes (bd-o5a) (#3480) 2026-04-25 11:30:19 -07:00
ANTIVIRUS.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
ARCHITECTURE.md docs: link canonical SYNC_CONCEPTS.md from deeper docs (#4248) 2026-05-29 22:44:54 -07:00
ATTRIBUTION.md fix: remove dead 3-way merge config remnants (GH#2353) 2026-03-05 15:57:33 -08:00
CI_CLEANUP_PLAN.md Add PR CI wrapper command surface (#4211) 2026-05-29 18:52:53 -07:00
CI_REQUIRED_CHECK_TOPOLOGY.md Add PR CI wrapper command surface (#4211) 2026-05-29 18:52:53 -07:00
CI_TEST_SURFACE_AUDIT.md Add PR CI wrapper command surface (#4211) 2026-05-29 18:52:53 -07:00
CLAUDE.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
CLAUDE_INTEGRATION.md fix(setup): finish hook JSON migration 2026-05-08 09:21:39 -07:00
CLI_REFERENCE.md fix(remote): remove cli invocations of 'dolt remote' and exclusively use store method and sql (#4236) 2026-06-05 13:58:21 -07:00
CODEX_INTEGRATION.md fix(codex): ship hook release safely 2026-05-27 13:19:41 -07:00
COLLISION_MATH.md docs: fix broken relative links across documentation 2025-12-16 00:46:08 -08:00
COMMUNITY_TOOLS.md docs: publish community tools on website (#4299) 2026-06-03 13:44:47 -07:00
CONFIG.md Add Jira custom field support for push (#3678) 2026-06-01 07:40:57 -07:00
CONTRIBUTOR_NAMESPACE_ISOLATION.md cleanup: remove remaining Gas Town terminology from help text, docs, and comments 2026-03-22 13:27:43 -07:00
COPILOT_CLI_INTEGRATION.md feat: add Copilot CLI setup recipe (#3839) 2026-05-14 10:51:38 -07:00
COPILOT_INTEGRATION.md feat: add Copilot CLI setup recipe (#3839) 2026-05-14 10:51:38 -07:00
DEPENDENCIES.md docs(deps): add DEPENDENCIES.md covering dependency system and gates 2026-02-27 10:09:05 -08:00
DOC_INVENTORY.md docs: record CI cleanup plan 2026-05-28 01:19:14 +00:00
DOLT-BACKEND.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
DOLT.md fix(remote): remove cli invocations of 'dolt remote' and exclusively use store method and sql (#4236) 2026-06-05 13:58:21 -07:00
ERROR_HANDLING.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
EXCLUSIVE_LOCK.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
FAQ.md docs: link canonical SYNC_CONCEPTS.md from deeper docs (#4248) 2026-05-29 22:44:54 -07:00
GIT_INTEGRATION.md docs: link canonical SYNC_CONCEPTS.md from deeper docs (#4248) 2026-05-29 22:44:54 -07:00
graph-links.md refactor: remove Gas Town references from codebase 2025-12-30 14:13:32 -08:00
ICU-POLICY.md Add PR CI wrapper command surface (#4211) 2026-05-29 18:52:53 -07:00
INSTALLING.md fix(install): use declared module path for go fallback (#4215) 2026-05-27 21:48:24 -07:00
INTEGRATION_CHARTER.md Document project scope boundaries (mybd-1fn) (#3842) 2026-05-13 06:49:11 -07:00
INTERNALS.md refactor: remove gastown/Gas Town string references from beads code and docs (bd-1ue8) 2026-03-20 18:39:50 -07:00
JSON_SCHEMA.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
LABELS.md cleanup: remove remaining Gas Town terminology from help text, docs, and comments 2026-03-22 13:27:43 -07:00
LINTING.md Add PR CI wrapper command surface (#4211) 2026-05-29 18:52:53 -07:00
messaging.md fix(create): commit labels during initial issue creation (#4149) 2026-05-24 19:23:46 -07:00
METADATA.md docs: publish community tools on website (#4299) 2026-06-03 13:44:47 -07:00
MOLECULES.md Keep regular epics open after the last child closes (#3276) 2026-04-17 15:10:38 -07:00
MULTI_REPO_AGENTS.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
MULTI_REPO_MIGRATION.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
OBSERVABILITY.md /{cmd,docs,internal}: more cleanup 2026-03-31 12:33:52 -07:00
PERFORMANCE_TESTING.md docs: update stale SQLite references to Dolt across 10 documentation files 2026-02-16 01:22:58 -08:00
PLUGIN.md fix(init): use git origin as default Dolt remote (#3909) 2026-05-13 07:02:39 -07:00
PROJECT_CHARTER.md Document project scope boundaries (mybd-1fn) (#3842) 2026-05-13 06:49:11 -07:00
PROTECTED_BRANCHES.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
QUICKSTART.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
README_TESTING.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
RECOVERY.md fix(dolt): detect Dolt ancestor-PK merge refusals and print bootstrap-canonical-clone recovery (bd-6dnrw.1) 2026-06-09 23:41:19 -04:00
RELEASE-STABILITY-GATE.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
RELEASING.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
REPO_CONTEXT.md docs: replace stale bd sync references with bd dolt push/pull (GH#2442, GH#2435) 2026-03-08 10:12:08 -07:00
ROUTING.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
RULES_AUDIT_DESIGN.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00
SECURITY-DEPENDENCY-EXCEPTIONS.md chore: harden release and dependency security 2026-04-28 08:45:22 +00:00
SETUP.md docs: add conservative Beads agent profile (#4220) 2026-05-28 15:20:25 -07:00
SYNC_CONCEPTS.md docs: clarify export versus database backup (#4048) 2026-05-20 16:19:23 -07:00
SYNC_SETUP.md /{.github,docs,go,internal,scripts}: bump driver/dolt version to 2.1.4 (#4326) 2026-06-08 11:31:14 -07:00
TESTING.md /{.github,docs,go,internal,scripts}: bump driver/dolt version to 2.1.4 (#4326) 2026-06-08 11:31:14 -07:00
TESTING_PHILOSOPHY.md Consolidate docs evidence review inventory 2026-05-09 07:21:46 -07:00
TODO.md docs: remove stale JSONL references from ~73 markdown files (bd-9ni.4) 2026-02-22 22:18:02 -08:00
TROUBLESHOOTING.md fix(setup): harden symlink follow-up handling 2026-05-27 13:32:00 -07:00
UI_PHILOSOPHY.md docs: consolidate duplicate UI_PHILOSOPHY files (GH#745) 2025-12-27 18:01:59 -08:00
UNINSTALLING.md docs: publish community tools on website (#4299) 2026-06-03 13:44:47 -07:00
WORKTREES.md docs: update user-facing URLs from steveyegge/beads to gastownhall/beads 2026-04-24 08:17:42 -07:00