Git branching strategies

Note date 29 Dec, 2020
Tags git
👋 FYI, this note is over 6 months old. Some of the content may be out of date.
On this page

Different branching strategies

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
← Back home