docs(governance): add merge-method decision matrix to branching strategy#79
Merged
docs(governance): add merge-method decision matrix to branching strategy#79
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request
Linked Issue
Closes #78
Type
Summary
Adds a canonical merge-method decision matrix and rationale to the branching strategy so contributors can consistently choose the correct merge strategy by branch pair.
TDD Checklist (Required)
If no tests were added, explain why:
Documentation-only governance clarification; no runtime behavior changes.
Architectural Integrity Checklist
Issue Hygiene Checklist
blocked-by, status labels are correct.Acceptance Criteria Verification
docs/developer/branching-strategy.mdunder "Merge Method Decision Matrix (Canonical)".Risk Notes (Optional)
Additional Notes
This update is intentionally placed in the developer-facing branching strategy doc to keep merge-policy guidance centralized.