Git Branching Models

Thoughts on different branching models for git.

git-flow

• Originally conceived of for software that is explicitly versioned
• Not necessarily intended for software that is continuously deployed (like modern web apps)

GitHub flow

• Lighter-weight than git-flow
• Essentially follows these steps:
  • Create a branch off of main
  • Make commits
  • Make a PR
  • Run tests
  • Discuss the PR
  • Update (if needed)
  • Deploy to production for final testing
    • This is an interesting one here…
  • Merge into main

Further Reading

• git-flow
• GitHub flow