Skip to content

docs: align merge-method guidance with linear history #3

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
zagrosi-code merged 1 commit into from
May 8, 2026
+1 −1
Merged

docs: align merge-method guidance with linear history #3

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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Allowed scopes: `identity`, `workspaces`, `tasks`, `agile`, `docs`, `chat`, `inc
4. Push your branch and open a PR using the template
5. Request review from at least one maintainer (until the team grows, this means a self-review walkthrough recorded in the PR description)
6. Address review feedback
7. Merge using **merge commits** (not squash) to preserve individual commit history and DCO sign-offs
7. Merge using **rebase merge** (not squash) to preserve individual commit history and DCO sign-offs. The `main` branch enforces `required_linear_history`, so merge commits are not permitted; rebase merge keeps every commit (with its `Signed-off-by:` trailer) on a linear history.

## Code Review Checklist

Expand Down
Loading