From 4bb0cce51fc06097b11e60e258bcecdc716afe9c Mon Sep 17 00:00:00 2001 From: MicrosoftWindows96 Date: Fri, 8 May 2026 13:55:43 +0100 Subject: [PATCH] docs: align merge-method guidance with linear history CONTRIBUTING.md previously instructed contributors to merge using merge commits, but the `main` branch enforces `required_linear_history`, which forbids merge commits and only permits rebase or squash merges. The two settings were internally inconsistent. Switching the guidance to rebase merge keeps the original intent (preserve individual commit history and DCO sign-offs) while matching the actual branch-protection rule. Squash remains explicitly off the table. Signed-off-by: MicrosoftWindows96 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 545d756..0880219 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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