Git branching strategies

On this page
  • Different branching strategies

Different branching strategies

  • GitFlow
  • Please stop recommending Git Flow!
  • ThreeFlow
  • Trunk Based Development
  • GitHub flow
  • Git DMZ

GitHub flow

  • Anything in the "main" branch is deployable
  • To work on something new, create a descriptively named branch off of master/main (ie: new-oauth2-scopes)
  • Commit to that branch locally and regularly push your work to the same named branch on the server
  • When you need feedback or help, or you think the branch is ready for merging, open a pull request
  • After someone else has reviewed and signed off on the feature, you can merge it into master
  • Once it is merged and pushed to ‘master’, you can and should deploy immediately
Edit this page
Want to make your own site like this?
Try gatsby-theme-code-notes by Zander Martineau.
Notes on code. My second brain, by Zander Martineau.