This fork intentionally uses two lanes:
mainis the fork integration branch. It may contain changes needed by downstream consumers such asisol8.feat/*branches are short-lived proof branches. They should only merge intomainafter they are validated in a real downstream integration path.
- Keep
upstream/mainas the reference branch foredera-dev/styrolite. - Periodically merge or rebase
upstream/maininto this fork'smainwhen upstream moves. - Do not stack experimental work directly on top of stale feature branches.
Recommended update flow:
git fetch upstream origingit checkout maingit merge upstream/main- Resolve conflicts and re-run local validation
- Push
mainback toorigin
Do not open upstream pull requests directly from this fork's main.
Instead:
- Start from
upstream/main - Cherry-pick or reimplement the smallest generic change set
- Open one focused PR per logical fix
Examples of upstream-friendly slices:
- generic attach/runtime correctness
- capability handling fixes
- mount API improvements
- explicit resource-limit semantics
Keep downstream-only integration details out of upstream PRs.
Before merging feat/* into main, validate the branch in the real downstream consumer that motivated the change. For the current fork, that usually means validating through isol8, not only by running styrolite unit tests in isolation.