Skip to content

Add branching patterns operational guide (GitHub Flow, Git Flow, release process)#42

Merged
tlmquintino merged 5 commits intomainfrom
copilot/add-branching-patterns-section
Apr 15, 2026
Merged

Add branching patterns operational guide (GitHub Flow, Git Flow, release process)#42
tlmquintino merged 5 commits intomainfrom
copilot/add-branching-patterns-section

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 11, 2026

Description

ADR-001 documents the decision on branching strategy but provides no actionable how-to guide for developers. This adds a practical reference covering both supported models and their release processes.

New: Guidelines/Branching.md

  • Overview — side-by-side comparison table of GitHub Flow vs Git Flow
  • GitHub Flow — default for all new repos; covers feature dev, release (tag from main), and hotfix workflows
  • Git Flow — for operationally critical/large/multi-version repos; covers feature dev, release branch lifecycle (developrelease/x.y.zmain → tag → back-merge), hotfix, and support branch workflows
  • Choosing a Model — GateKeeper decision criteria (distilled from ADR-001)
  • Migration checklist — steps to upgrade a repo from GitHub Flow to Git Flow
  • External Contractors — links to the Integration Delivery Workflow for upstream/upstream/<vendor> branches

Contributor Declaration

By opening this pull request, I affirm the following:

  • All authors agree to the Contributor License Agreement.
  • The code follows the project's coding standards.
  • I have performed self-review and added comments where needed.
  • I have added or updated tests to verify that my changes are effective and functional.
  • I have run all existing tests and confirmed they pass.

…release process

Co-authored-by: jameshawkes <11695815+jameshawkes@users.noreply.github.com>
Copilot AI changed the title [WIP] Implement section on branching patterns based on ADR Add branching patterns operational guide (GitHub Flow, Git Flow, release process) Mar 11, 2026
@tlmquintino
Copy link
Copy Markdown
Member

@copilot please rebase this PR and move the file to be part of the Guidelines directory with the name Branching.md

…anching.md

Co-authored-by: tlmquintino <965734+tlmquintino@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented Mar 14, 2026

@copilot please rebase this PR and move the file to be part of the Guidelines directory with the name Branching.md

Done in 85a8e63. The file has been moved to Guidelines/Branching.md (alongside the existing pr_guidelines.md), the Branching/ directory has been removed, and README.md is restored to its original state.

@tlmquintino tlmquintino marked this pull request as ready for review April 15, 2026 18:57
@tlmquintino tlmquintino merged commit 32eb73a into main Apr 15, 2026
1 check passed
@tlmquintino tlmquintino deleted the copilot/add-branching-patterns-section branch April 15, 2026 18:57
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.

3 participants