Skip to content

docs: explain the fork delta and upstream sync - #5

Merged
docxology merged 2 commits into
masterfrom
docs/fork-and-upstream-guide
Nov 4, 2026
Merged

docxology merged 2 commits into
masterfrom
docs/fork-and-upstream-guide

Conversation

@docxology

Copy link
Copy Markdown
Collaborator

Adds docs-mkdocs/guides/fork-and-upstream.md and a nav entry under Guides.

The fork's own 16 commits add the .aii sidecar, TASKS.md, the GNN bridge with its two guides, fork-local nightly workflows, master entries in the CI branch lists, and the sync convention in AGENTS.md. This guide collects that delta in one place and documents:

  • what the fork adds and the additive-only boundary for upstream-inherited trees;
  • the sync rule: merge upstream/main into a branch off master, land it as a merge commit, never squash or rebase;
  • how to inspect the current delta with git log and git diff.

No upstream-inherited code path is rewritten; this is a fork-local additive documentation change. The guide's two relative links resolve to the existing GNN guides.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>

docxology and others added 2 commits November 3, 2026 13:12
Adds a fork-local guide that collects the additive delta (sidecar, TASKS.md, GNN bridge and its guides, fork-local workflows, master CI entries, sync convention) and documents the merge-upstream/main rule and the documentation boundary for upstream-inherited trees. Adds the page to the strict mkdocs nav.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
@docxology
docxology merged commit d22e253 into master Nov 4, 2026
8 checks passed
@docxology
docxology deleted the docs/fork-and-upstream-guide branch November 4, 2026 16:20
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