Git branching strategy template

Trunk-based development with short-lived feature branches, pull requests, release branches and a cherry-picked hotfix.

Use this templateFree, opens in your browser. No sign-up.

Git branching strategy template
feature/*
main
release/*
v1.0
login form
merge PR #12
fix: typo
cache layer
merge PR #18
cut release/1.1
hotfix: null check
cherry-pick hotfix
Rules
• main is always deployable
• Feature branches live < 2 days
• Merge only with review + green CI
• Release branches take fixes only; tag v1.1 from release
Git branching
branch
PR + review
branch
PR + CI green
cherry-pick
The git branching strategy template as it opens in Kelvo: 9 boxes, 1 sticky note and 11 links.

What's on the board

  • login form
  • cache layer
  • feature/*
  • v1.0
  • merge PR #12
  • fix: typo
  • merge PR #18
  • cherry-pick hotfix
  • main
  • cut release/1.1
  • hotfix: null check
  • release/*
  • Rules • main is always deployable • Feature branches live < 2 days • Merge only with…

How to use this template

  1. Click Use this template. It opens in the Kelvo app as a new board, saved in your browser.
  2. Double-click any box to change its text. Replace the examples with your own content.
  3. Paste a table. Paste comma- or tab-separated text and it becomes a table. Tab moves to the next cell and adds rows as you go.
  4. Paste code as code. Paste a snippet and it becomes a code block with syntax colouring; Tab indents inside it.
  5. Link by dragging. Hover a box and drag one of its dots onto another box. The whole box is the target, and links stay attached when you move things.

Good for

  • git
  • branching
  • trunk-based
  • version control
  • engineer
  • Designing a schema or an API before writing it
  • Explaining a tricky flow in a code review or design doc
  • Agreeing on team conventions such as branching and reviews

Related templates

  • ER diagram (database schema) template previewER diagram (database schema)

    Entities as tables with columns, types and keys, joined by one-to-many relationships — sketch a schema before the migration.

  • UML class diagram template previewUML class diagram

    Classes with fields and methods, associations with multiplicity, and an interface with two implementations.

  • State machine template previewState machine

    Every state an order can be in and the events that move it — the source of truth for status logic and tests.

  • Sequence diagram (request flow) template previewSequence diagram (request flow)

    Numbered steps across Client, API gateway, service, database and a third party — how one checkout request really travels.

  • Code review checklist template previewCode review checklist

    What to look for in a pull request, from correctness to security, so reviews are fast and consistent.

  • REST API design template previewREST API design

    An endpoint table — method, path, auth, status codes — plus the conventions every endpoint follows.

All software engineering diagram templates · All templates

Use the git branching strategy template