Skip to content

docs(governance): add merge-method decision matrix to branching strategy#79

Merged
T72 merged 1 commit intodevelopfrom
docs/merge-method-matrix-78
Mar 2, 2026
Merged

docs(governance): add merge-method decision matrix to branching strategy#79
T72 merged 1 commit intodevelopfrom
docs/merge-method-matrix-78

Conversation

@T72
Copy link
Copy Markdown
Owner

@T72 T72 commented Mar 2, 2026

Pull Request

Linked Issue

Closes #78


Type

  • bug
  • refactor
  • feature
  • architecture
  • governance
  • infra
  • performance
  • security
  • test
  • documentation
  • verification

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)

  • New behavior has tests (unit or contract).
  • Bug fixes include a regression test.
  • Refactors preserve behavior (tests protect it).
  • No skipped tests introduced.
  • CI is green.

If no tests were added, explain why:
Documentation-only governance clarification; no runtime behavior changes.


Architectural Integrity Checklist

  • No core-plugin coupling introduced.
  • No unintended public API contract changes.
  • Provider abstraction remains isolated.
  • Middleware ordering preserved (if modified).
  • Breaking change? (If yes, ADR required.)

Issue Hygiene Checklist

  • Linked issue exists and matches this PR scope.
  • If linked issue contains blocked-by, status labels are correct.

Acceptance Criteria Verification

  • Criterion 1: Explicit method by branch pair is documented. Added in docs/developer/branching-strategy.md under "Merge Method Decision Matrix (Canonical)".
  • Criterion 2: Why each method is used is documented. Added rationale bullets directly under the matrix.
  • Criterion 3: Guidance aligns with existing governance. Content aligns with current branch model and linear main-to-develop sync runbook.

Risk Notes (Optional)

  • Performance impact: none.
  • Cost impact: none.
  • Latency impact: none.
  • Migration required: none.

Additional Notes

This update is intentionally placed in the developer-facing branching strategy doc to keep merge-policy guidance centralized.

@T72 T72 merged commit 641909a into develop Mar 2, 2026
5 checks passed
@T72 T72 deleted the docs/merge-method-matrix-78 branch March 2, 2026 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docs(governance): add explicit merge-method decision matrix to branching strategy

1 participant