Skip to content

docs(contributing): clarify merge policy #4

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
vklimontovich merged 1 commit into from
May 28, 2026
Merged

docs(contributing): clarify merge policy #4

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
7 changes: 5 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ Branch protection enforces this on `master`.

**Branch naming:** Use a type prefix — `feat/`, `fix/`, `chore/`. Example: `fix/connection-leak`.

**Merging policy:** We avoid merge commits. Always rebase onto `master` — never merge
`master` into a branch. No squash merge on PRs. Local squash before opening a PR is fine.
**Merging policy:** When working on a feature branch, never merge `master` into it —
always rebase your branch onto the latest `master`. When merging a PR into `master`,
either "Create a merge commit" (the default) or "Rebase and merge" is fine. Squash merge
stays off; if you want to squash overly granular commits, do it locally before opening
the PR.

**Commit style:** [Conventional commits](https://www.conventionalcommits.org/) —
`type(scope): description`.
Loading