docs: align merge-method guidance with linear history#3
Merged
Conversation
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 <spam@zagrosi.com>
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
CONTRIBUTING.md instructed contributors to use merge commits, but
mainenforcesrequired_linear_history. The two settings were internally inconsistent and blocked the foundation PR's merge endpoint. Switching the guidance to rebase merge matches the branch-protection rule and preserves individual commit history plus DCO sign-offs.Test plan