Git-flow and master with multiple parallel release-branches

by

In the git-flow model, your “latest released” version actually maps to the master, while your “preview release” maps to a git-flow release branch. It is forked from develop and finally merged into master when the actual release happens. Then this will become your “latest release” and you will usually fix only bugs for that release, using git-flow hotfixbranches. In this way, your master always represents the most stable state of your latest released version.

If you want to fix bugs for older releases or do any other develop there, you will fork a support branch from the appropriate commit in master (you will have all versions ever created there). support branches are still experimental (according to the docs) and are not well documented. But as you can see from the command line help:

usage: git flow support [list] [-v]
       git flow support start [-F] <version> <base>

these branches are just started and not intended to be merged back to master nor develop. This is usually fine, as fixes to “ancient” releases or features requested by customers to be implemented in “ancient” releases can’t or should not go back into master. If you still think, you want to port a fix to your main development line (represented by master and develop), just start a hotfix, cherry-pick your changes and finish the hotfix.

More Related Contents:

  1. Create a branch in Git from another branch
  2. Handle git branching for test and production
  3. Git merge hotfix branch into feature branch
  4. Definition of “downstream” and “upstream”
  5. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  6. Git – how to force merge conflict and manual merge on selected file
  7. SSL certificate rejected trying to access GitHub over HTTPS behind firewall
  8. Checking out old files WITH original create/modified timestamps
  9. Git 1.6.4 beta on Windows (msysgit) – Unix or DOS line termination
  10. Is it possible to include a file in your .gitconfig
  11. Git under windows: MSYS or Cygwin?
  12. Whitelisting and subdirectories in Git
  13. git push to multiple repositories simultaneously [duplicate]
  14. How do I make git block commits if user email isn’t set?
  15. Difference between git stash pop and git stash apply
  16. Merging between forks in GitHub
  17. Git – finding a filename from a SHA1
  18. Gerrit error when Change-Id in commit messages are missing
  19. Is it possible to have different Git configuration for different projects?
  20. Trouble setting up git with my GitHub Account error: could not lock config file
  21. How do I add files and folders into GitHub repos?
  22. How do I squash two non-consecutive commits?
  23. How do I select a merge strategy for a git rebase?
  24. What does tree-ish mean in Git?
  25. Why is git is ignoring files that aren’t in the .gitignore file?
  26. What are the consequences of using receive.denyCurrentBranch in Git?
  27. Git: add vs push vs commit
  28. Unignore subdirectories of ignored directories in Git
  29. Git: want to iterate through all commits on branch, and list files in each commit
  30. Limiting file size in git repository

Leave a Comment