Update branching documentation to reflect merge flow #11227
+27
−21
Conversation
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
Clarify that the merge flow is: maintenance-9.x → master → maintenance-10.x This keeps master synchronized with the current version branch, so if contributors accidentally branch from master they get current version code without pulling in breaking changes from the next major version. Key changes: - Emphasize master is NOT a PR target (receives merges only) - Update merge flow documentation in both Development.md and release-create.md - Clarify backward compatibility vs breaking changes - Add maintainer workflow examples showing 2-step merge process
The 'Choosing the Right Target Branch' section already covers that master is not a PR target. Lead with what contributors should do rather than what they should not do.
Contributor
PR Compliance Guide 🔍All compliance sections have been disabled in the configurations. |
Contributor
PR Code Suggestions ✨No code suggestions found for the PR. |
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.
User description
Clarify that the merge flow is: maintenance-9.x → master → maintenance-10.x
This keeps master synchronized with the current version branch. If contributors accidentally branch from master, they get current version code without pulling in breaking changes from the next major version.
Changes:
PR Type
Documentation
Description
Clarifies merge flow: maintenance-9.x → master → maintenance-10.x
Emphasizes master is NOT a PR target, receives merges only
Adds detailed maintainer workflow examples with step-by-step merge process
Removes redundant Master Branch section, consolidates branching guidance
Diagram Walkthrough
File Walkthrough
Development.md
Restructure branching documentation with merge flow claritydocs/development/Development.md
version via merges
examples
release-create.md
Update branch usage guidance and merge flow directiondocs/development/release-create.md
maintenance-10.x