Branching Strategies [closed]

by

Here is the method I’ve used in the past with good success:

/trunk – bleeding edge. Next major release of the code. May or may not work at any given time.

/branches/1.0, 1.1, etc. Stable maintenance branches of the code. Used to fix bugs, stabilize new releases. If a maintenance branch, it should compile (if applicable) and be ready for QA/shipping at any given time. If a stabilization branch, it should compile and be feature complete. No new features should be added, no refactoring, and no code cleanups. You can add a pre- prefix to indicate stabilization branches vs maintenance branches.

/branches/cool_feature. Used for highly experimental or destructive work that may or may not make it into trunk (or a maintenance branch). No guarantees about code compiling, working, or otherwise behaving sanely. Should last the minimum time as possible before merging into the mainline branch.

/tags/1.0.1, 1.0.2, 1.1.3a, etc. Used for tagging a packaged & shipped release. Never EVER changes. Make as many tags as you want, but they’re immutable.

More Related Contents:

  1. When should you branch?
  2. Named Branches vs Multiple Repositories
  3. Mercurial — revert back to old version and continue from there
  4. How can I delete all Git branches which have been merged?
  5. What is a tracking branch?
  6. How can I get a list of Git branches, ordered by most recent commit?
  7. Rebasing a branch including all its children
  8. Using IPython / Jupyter Notebooks Under Version Control
  9. ClearCase advantages/disadvantages [closed]
  10. Should I store generated code in source control
  11. What is the cleverest use of source repository that you have ever seen?
  12. View a file in a different Git branch without changing branches
  13. IntelliJ IDEA 9/10, what folders to check into (or not check into) source control?
  14. Source control vs. Revision Control?
  15. How do I delete all Git branches which have been merged?
  16. What’s the best three-way merge tool? [closed]
  17. Storing third-party libraries in source control
  18. Mercurial for Beginners: The Definitive Practical Guide
  19. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  20. Is version control (ie. Subversion) applicable in document tracking? [closed]
  21. Mercurial Subrepos – How do you create them and how do they work?
  22. Mercurial: How to ignore changes to a tracked file
  23. How do I perform a recursive checkout using ClearCase?
  24. Is there a way to keep Hudson / Jenkins configuration files in source control?
  25. Mercurial: Merging one file between branches in one repo
  26. How to find untracked files in a Perforce tree? (analogue of svn status)
  27. Git and working on multiple branches
  28. Commit a file to a Different Branch Without Checkout
  29. Code version change “rules” [closed]
  30. What is the difference between all the different types of version control?

Leave a Comment