DevOps Generators

Workflow Guide

All tools

Three common Git branching models, each boiled down to a few lines you can paste into team docs.

How it works

Four simple steps

1

Pick a model

Select GitHub Flow, Git Flow or Trunk-based.

2

Read the outline

See the branches and steps that model expects.

3

Compare options

Switch models to weigh extra branches against your release pace.

4

Copy into team docs

Paste the outline into a README or contributing guide.

Workflow Guide

About Workflow Guide

A small team is setting up its first shared repository, and someone suggests Git Flow because it is familiar. Before committing to release branches and a develop line, it helps to see the lighter alternatives next to it.

Select GitHub Flow, Git Flow or Trunk-based and the panel shows a short outline of that model. GitHub Flow is six steps from branching off main to deploying after the merge. Git Flow lists its long-lived main and develop branches and where feature, release and hotfix branches start and end. Trunk-based comes down to three principles: short-lived branches, merging to trunk daily, and feature flags for unfinished work. The outlines are summaries for comparison, not full procedures or command lists.

A rough guide: if you deploy continuously from a single production version, the extra branches in Git Flow mostly add merge work. If you maintain several released versions at once, its release and hotfix branches earn their keep. Whichever you pick, write it down where new contributors will find it, such as the README or a contributing guide.

The outlines are static text in the page. Pair the model with a naming convention from the branch name builder and commit rules you can test with the commit subject checker. For tidying history before a merge, the interactive rebase cheat sheet has the commands.

Keyboard shortcut

Ctrl Enter - Run tool
FAQ

Frequently asked questions

See all FAQs

Answers for this tool. For site-wide help, open the FAQ hub.

GitHub Flow or trunk-based development. Both keep one main line that is always deployable. Trunk-based goes further by merging at least daily and hiding unfinished work behind feature flags.

No. It outlines the branches and steps of each model. The reset and rebase helpers in the same category cover specific commands.

Many teams do, for example GitHub Flow plus an occasional release branch for a version they still have to patch. Document the exception so it does not turn into a second, unwritten workflow.

View more FAQs

Related tools

View all

Kubernetes Manifest Studio

Generate Deployment, Service, and Ingress YAML with a drift checklist.

Open

K8s Inspector

Summarize Kubernetes YAML kinds, names, and labels.

Open

K8s Resource Diff

Diff two Kubernetes manifests locally.

Open

K8s Manifest Splitter

Split multi-document YAML into one file per resource.

Open

Explore 321 free tools

Everything you need as a developer, marketer or creator - in one beautiful place.

Browse all tools