Skip to content

docs: branch strategy + main consolidation runbook - #10

Closed
ihistand wants to merge 1 commit into
restore-postgres-adapterfrom
docs/branch-strategy
Closed

docs: branch strategy + main consolidation runbook#10
ihistand wants to merge 1 commit into
restore-postgres-adapterfrom
docs/branch-strategy

Conversation

@ihistand

Copy link
Copy Markdown
Collaborator

Summary

Captures the long-term branch layout for sqlanvil + the runbook for consolidating the postgres-first-class PR stack onto `main`. Lives at `docs/branch_strategy.md`.

Decisions captured

  • `main` stays sqlanvil's source of truth — already diverged from upstream (postgres restore + Antigravity docs were committed directly), no value in preserving pristine fork.
  • Add `upstream-main` mirror branch for occasional cherry-picks from `dataform-co/dataform/main`.
  • Apply branch protection (force-push + deletion only — skip required reviews + status checks for now since solo dev + no CI yet).
  • Consolidate the 9-PR stack only after each PR has been reviewed + merged into `restore-postgres-adapter` individually.

Contents

  • Path A (recommended, simpler) vs Path B (rename main) comparison
  • Timing — consolidate after stack lands, not during
  • Branch protection table (what to enable now vs later — CI status checks added when CI lands)
  • Upstream sync cadence (quarterly fetch, cherry-pick if worth it, otherwise skip — upstream activity is very low)
  • PR branch naming conventions (`rename/`, `adapter/`, `fix/`, `ci/`, `docs/`)
  • Action items checklist for the consolidation

Independent of code stack

This is a planning doc. No code changes. Can merge any time; doesn't block the postgres-first-class PR stack or the docs site plan PR.

Test plan

  • Doc renders as markdown
  • Consolidation steps run successfully when stack lands (deferred to post-stack)

🤖 Generated with Claude Code

Captures the long-term branch layout for sqlanvil and the runbook for
consolidating the postgres-first-class PR stack onto main.

Decisions:
- main stays sqlanvil's source of truth (already diverged from
  upstream — no value in preserving pristine fork)
- Add an upstream-main mirror branch for occasional cherry-picks from
  dataform-co/dataform/main
- Apply branch protection (force-push + deletion only — skip required
  reviews + status checks for now since solo dev and no CI yet)
- Consolidate the 9-PR stack only after each PR has been reviewed
  and merged into restore-postgres-adapter individually

Includes:
- Path A (recommended, simpler) vs Path B (rename main) comparison
- Timing — consolidate after stack lands, not during
- Branch protection table (what to enable now vs later)
- Upstream sync cadence (quarterly fetch, cherry-pick if worth it,
  otherwise skip — upstream activity is very low)
- PR branch naming conventions (already in use across the stack)
- Action items checklist for the consolidation
@ihistand

ihistand commented Jun 7, 2026

Copy link
Copy Markdown
Collaborator Author

Superseded: the Postgres reintegration + Dataform→SQLAnvil rename landed on main directly, and the docs moved to the SQLAnvil/docs repo. Closing as part of #12 (stale-branch prune). The one un-migrated draft, gcp_test_project_setup.md, was migrated to SQLAnvil/docs.

@ihistand ihistand closed this Jun 7, 2026
@ihistand
ihistand deleted the docs/branch-strategy branch June 7, 2026 01:45
ihistand added a commit that referenced this pull request Jul 21, 2026
…a post_operations)

Mirrors the agent-skills SKILL.md update: delta #10 expanded with the AI/BI
framing (descriptions/columns persist as catalog comments, join targets named
in column descriptions, PK/FK via post_operations with NOT ENFORCED on
BigQuery targets, uniqueKey/uniqueKeys exclusivity, catalog artifacts, guide
link); delta #9 covers FKs; delta #11 NOT-ENFORCED flag scoped.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01W86VUf4ptKnmhxWoqgA7gb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant