Git branch strategy for small dev team [closed]

by

You might benefit from the workflow Scott Chacon describes in Pro Git. In this workflow, you have two branches that always exist, master and develop.

master represents the most stable version of your project and you only ever deploy to production from this branch.

develop contains changes that are in progress and may not necessarily be ready for production.

From the develop branch, you create topic branches to work on individual features and fixes. Once your feature/fix is ready to go, you merge it into develop, at which point you can test how it interacts with other topic branches that your coworkers have merged in. Once develop is in a stable state, merge it into master. It should always be safe to deploy to production from master.

Scott describes these long-running branches as “silos” of code, where code in a less stable branch will eventually “graduate” to one considered more stable after testing and general approval by your team.

Step by step, your workflow under this model might look like this:

  1. You need to fix a bug.
  2. Create a branch called myfix that is based on the develop branch.
  3. Work on the bug in this topic branch until it is fixed.
  4. Merge myfix into develop. Run tests.
  5. You discover your fix conflicts with another topic branch hisfix that your coworker merged into develop while you were working on your fix.
  6. Make more changes in the myfix branch to deal with these conflicts.
  7. Merge myfix into develop and run tests again.
  8. Everything works fine. Merge develop into master.
  9. Deploy to production from master any time, because you know it’s stable.

For more details on this workflow, check out the Branching Workflows chapter in Pro Git.

More Related Contents:

  1. How to remove local (untracked) files from the current Git working tree
  2. Make an existing Git branch track a remote branch?
  3. How do you create a remote Git branch?
  4. How to get the current branch name in Git?
  5. Git fetch remote branch
  6. Showing which files have changed between two revisions
  7. Branch from a previous commit using Git
  8. Can I recover a branch after its deletion in Git?
  9. Default behavior of “git push” without a branch specified
  10. How to fetch all Git branches
  11. How is a tag different from a branch in Git? Which should I use, here?
  12. Difference between git checkout –track origin/branch and git checkout -b branch origin/branch
  13. Show just the current branch in Git
  14. Using Git, show all commits that are in one branch, but not the other(s)
  15. How do I get the current branch name in Git?
  16. How do I fetch all Git branches?
  17. How do I create a remote Git branch?
  18. View a file in a different Git branch without changing branches
  19. How to determine when a Git branch was created?
  20. How do I remove local (untracked) files from the current Git working tree?
  21. Creating a new empty branch for a new project
  22. Git undo local branch delete
  23. `git fetch` a remote branch
  24. How do I list all remote branches in Git 1.7+?
  25. Git: Merge a Remote branch locally
  26. How do I run git log to see changes only for a specific branch?
  27. How to ‘git pull’ into a branch that is not the current one?
  28. Git: How to list commits on this branch but not from merged branches
  29. Commit a file to a Different Branch Without Checkout
  30. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?

Leave a Comment