Image from Encrypted-TBN

A Modest Git Branching Proposal

You need exactly two types of branches, no more.

Chris Fox
Chris Fox
Nov 29, 2019 · 11 min read

Introduction

Audience

First Principle: Simplicity

Image from SlideshareCDN
I love making things hopelessly complicated! Image from Nvie

Git Impositions

Branch Again and Again

We should never do this (Diagram by LucidChart)

One Branch at a Time

Poor Merge

Wrong-Way Merges

Image from FaithX

Primary Considerations

The Branch Types

Master Branch

HotFix Branch

Photo by Cullan Smith on Unsplash
HotFix Lifetime (diagram by LucidChart)

Feature Branch

Image from Automatic Panda
Feature Lifetime (diagram by LucidChart)

Other Branch Types

Prudent Practices

Branch Naming

Tag Branch Checkpoints

Tagged Milestone (diagram by LucidChart)

Manually Reconcile Two Branches

Inserting At End

Cleanup Work

No Branch Nostalgia

Conclusion

Resources

The Startup

Get smarter at building your thing. Join The Startup’s +793K followers.

Sign up for Top 10 Stories

By The Startup

Get smarter at building your thing. Subscribe to receive The Startup's top 10 most read stories — delivered straight into your inbox, once a week. Take a look.

By signing up, you will create a Medium account if you don’t already have one. Review our Privacy Policy for more information about our privacy practices.

Check your inbox
Medium sent you an email at to complete your subscription.

Chris Fox

Written by

Chris Fox

American Software Developer living in Vietnam. Classical musician (guitar, woodwinds), weightlifter, multilingual, misanthrope • XY

The Startup

Get smarter at building your thing. Follow to join The Startup’s +8 million monthly readers & +793K followers.

Chris Fox

Written by

Chris Fox

American Software Developer living in Vietnam. Classical musician (guitar, woodwinds), weightlifter, multilingual, misanthrope • XY

The Startup

Get smarter at building your thing. Follow to join The Startup’s +8 million monthly readers & +793K followers.

Medium is an open platform where 170 million readers come to find insightful and dynamic thinking. Here, expert and undiscovered voices alike dive into the heart of any topic and bring new ideas to the surface. Learn more

Follow the writers, publications, and topics that matter to you, and you’ll see them on your homepage and in your inbox. Explore

If you have a story to tell, knowledge to share, or a perspective to offer — welcome home. It’s easy and free to post your thinking on any topic. Write on Medium

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store