Skip to content

Document squash-only merge policy #2

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parshan-MHB merged 1 commit into from
Apr 21, 2026
Merged

Document squash-only merge policy #2

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@

- this PR targets `main` from a non-`main` feature branch
- required CI is expected to pass before merge
- this PR is expected to land with squash merge
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
4. Run the strongest local verification you can before opening a PR.
5. Open a pull request into `main`.
6. Merge only after required CI is green.
7. Merge with squash merge so each PR lands as one commit on `main`.

Direct pushes to `main` are not part of this repo workflow. The `main` branch is protected and changes should land through pull requests, including maintainers' own changes.
`main` also enforces linear history, so merge commits and rebase merges are not part of the repo workflow.

Suggested branch naming:

Expand Down Expand Up @@ -45,6 +47,7 @@ Use `make build-ios` when you need an iOS build check and your machine has the r
- include screenshots for UI changes when relevant
- keep the PR focused enough to review cleanly
- do not open a PR until the branch is in a state that can pass required CI
- expect the PR to land with squash merge, not merge commit or rebase merge

## Before Opening A PR

Expand Down
Loading