Upstream Sync Guide
This fork tracks the upstream repository (github/spec-kit) while keeping fork-specific enhancements isolated and compatible.
Recommended Workflow
- Add the upstream remote (once):
bash
git remote add upstream <https://github.com/github/spec-kit.git>
- Fetch upstream:
bash
git fetch upstream --prune
- Merge or rebase upstream into your working branch:
bash
git merge upstream/main
# or
git rebase upstream/main
-
Resolve conflicts and run tests (at least Phase 0 E2E scripts).
-
Push your fork branch back to
origin.
Keeping Fork Changes Isolated
- Prefer additive changes in
templates/,scripts/, and documented overrides - Avoid changing upstream-owned behavior unless required
- Keep
SPECIFY_TEMPLATE_REPOoverride as the main fork distribution mechanism
Compatibility Notes
When upstream evolves, prioritize:
- Merging upstream improvements
- Re-validating fork templates and scripts
- Updating documentation as needed