Git Flow basic operations

Common Scenarios for Developers

Complete functionality in a regular project

• Git flow feature start 888
• Commit changes using daily git commands until the function is complete
• Git flow feature finish 888

This action merges the feature/888 branch into the dev branch and, if the function is complete, can be push to remote dev for testing

Complete a single function and test

Steps are the same as regular development, but can be push to a remote git library

• Git flow feature publish 888
• Testing and fixing bugs
• Git flow feature finish 888

Emergency fix Bug

Use hotfix to fix bugs urgently

• Git Flow Hotfix start 888
• Fix bugs
• Git Flow Hotfix finish 888

This merges the modified code into the dev and master branches, and prepares for subsequent releases.

Code Publishing

Do the code release when the feature is very high

• Git flow release start v0.1
• Allow a small amount of bugfix action
• Git flow release Finish v0.1

Quote Original: http://www.jeffkit.info/2010/12/860/

Git Flow basic operations