Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/template-sync-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ ignore:
# Each instance chooses its own license and copyright holder.
- LICENSE

# Each package's README is entirely its own (name, usage, API); a merge
# against this template's README conflicted on every sync, so it is
# instance-owned from creation, like pyproject.toml.
- README.md

# The package scaffold: an instance renames the distribution and the import
# package (see README.md), owns its dependencies, code, tests, benchmarks
# and import-linter contract, so none of it can be synced.
Expand Down Expand Up @@ -146,9 +151,6 @@ ignore:
- .github/template-sync-manifest.local.yml

merge:
# Project identity (name/description) is interpolated per instance.
- README.md

# Files with no include mechanism of their own (JSON configs, prek's
# .pre-commit-config.yaml), and docs an instance appends to: a three-way
# merge keeps the instance's additions.
Expand Down
4 changes: 4 additions & 0 deletions docs/TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,10 @@ the place for their own runtime (FastAPI, axum, React) and their own ADRs.
A mid-layer classifies its own tree for its instances in its own
`.github/template-sync-manifest.yml`, which is `merge` tier in every
instance: base's additions are resolved by hand there.
In `template-python-package`, `README.md` is `ignore` tier: each package's
README is entirely its own, so a merge conflicted on every sync. The
instance owns it from creation, and later changes to the template's
README no longer reach instances by sync.
An instance lists extra paths of its own under `ignore:` in
`.github/template-sync-manifest.local.yml`. Which template an instance
follows is recorded in its `.github/template-sync-state.json`
Expand Down
Loading