Your on the right track / idea with Git-flow. Your Master become primary development of next release (with feature branches off of it).. while you continue to have release branches that can have hot fix branches off of them. (don't use Master as your release branch ! - bad practice ! )
Here is the Git-flow cheat sheet to make it easy for everyone to understand... just scroll it down to gain the understanding. Its really that easy. http://danielkummer.github.io/git-flow-cheatsheet/ Most large projects have moved into using git-flow ... and tools like Eclipse Mars, IntelliJ, Sourcetree, etc...have Git-flow either built in or plugin available now. If you want to live on the command line, then that is handled easily by the instructions in the above link. Thad +ThadGuidry <https://www.google.com/+ThadGuidry>
