bk99.de entertain the web since 1997

bk99.de
HN · GitCurated

Git flow: a successful branching model

Summary

Vincent Driessen describes a strict Git model with long-lived main branches and short-lived branches for features, releases and bug fixes. An understandable model can improve coordination and still be too heavyweight for small teams. Branching rules only work together with clear rules for tests, reviews and releases.

Ideas

  • master keeps released states, while develop integrates the upcoming version.
  • Feature branches isolate unfinished work from the shared integration line.
  • Release and hotfix branches make different stabilisation paths explicitly visible.

Recommendations

  • Only use git flow if parallel releases justify its additional complexity.
  • Prefer shorter branch lifetimes when continuous delivery matters more.

References

Read the original post

Search the Web Archive

HN · 2013

Learning Git branching interactively

Peter Cottle develops a visual practice environment in which Git commands change a commit graph immediately. Learn Git Branching runs in the browser. It covers rebase, cherry-pick and remotes.

HN · 2024

Linux's first Git commit and colliding SHA prefixes

Kees Cook demonstrates in practice why automated Linux tools must not treat Git commit prefixes as unique identifiers. The colliding prefix is 1da177e4c3f4. At the time, 590 Linux commits used this prefix in Fixes tags.

HN · 2017

The biggest and weirdest Linux kernel commits

Gary Bernhardt examines extreme objects in the Linux Git history and explains how imports, tools and data formats create surprising outliers. The Linux kernel has a very large public Git history. Git addresses objects via cryptographic hash values.