I take you through exactly what Git Flow is and how to apply it to a team. This video serves as a strong foundation for you. You should take what you learn from this video, assess it first, then apply it to you project...
1 - What is Git Flow - 0:06
2 - How it works - 0:35
3 - Creating a feature - 2:29
4 - Release Branches - 5:32
5 - Managing Hotfixes - 10:52
Check out the blog post:
http://revgov.co.uk/blog/tutorial-what-is-git-flow
Reval Govender
LinkedIn: https://uk.linkedin.com/in/reval-govender-0ba14860
Twitter: https://twitter.com/RevalGovender
Links:
Atlassian - https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
Vince Driessen - http://nvie.com/posts/a-successful-git-branching-model/
Semantic Versioning - http://semver.org/
/**UPDATE **/
Scenario: You need to make a "hotfix", after you have already created a "release branch".
Solution:
1. You should create your "hotfix" branch as described at: 10:52
2. Once you have completed your "hotfix", you should merge it back into "develop" and "master", as described in the video.
3. You also need to merge your "hotfix" branch into your "release" branch. This is to ensure your release branch has the latest stable code.
