Skip to content

docs(otter): land fork changes through pull requests #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ckafrouni merged 1 commit into from
Oct 6, 2026
Merged

docs(otter): land fork changes through pull requests #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 2 deletions OTTER.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ different and how to keep the fork aligned with upstream.
7. `chore(otter): changes before the <date> sync (#N)`, oldest first: everything committed to
`main` between two syncs, squashed by that sync's PR. Keep each one as its own commit; never
fold them into each other or into the features.
- **Changing the fork:** commit directly to `main`. The next sync squashes those commits into one
new sync commit. Never merge upstream into Otter's `main`.
- **Changing the fork:** land every change on `main` through a pull request, and merge it only
once CI is green. Never push to `main` directly. Agents run only targeted checks and leave the
full suite to CI (see `AGENTS.md`), so the PR is what keeps a missed test out of `main` and out
of the nightly release. Asking an agent to change the fork counts as asking it for that PR. The
next sync squashes the merged commits into one new sync commit; publishing a sync (below) is the
only direct write to `main`. Never merge upstream into Otter's `main`.

### Preparing a sync

Expand Down
Loading