Git workflow


git pull

1. ‘git flow release start 1.1’ works

create a new release branch named ‘release/1.1’ (1.1 will be the number you assigned)
bump the version number

2. Fuse custom script makes change log

create changelog entry
commit the change on develop branch

3. ‘git flow release finish 1.1’ works

merge the change after “git flow release start”
*git-flow will make sure everything is correctly merged into both master and develop. Developers can work last modifying before starting release, but Fuse’s nr process merely uses release branch for release purpose.
*Hotfix branches are a lot like release branches, except they’re based on master instead of develop. However, Fuse doesn’t use Hotfix branch.

Using git-flow to automate your git branching workflow
git-flow is a library of git subcommands that helps automate your branching and release workflow workflow, using Vincent Driessen's successful branching model.

Here is how to launch the website from staging server.
If you have not committed anything on master branch

git checkout -b master
git merge develop
git push -u origin master

Then, go back to develop branch

git checkout develop

On the project directory of dev server

git flow init -d

Then follow like below

Which branch should be used for bringing forth production releases?
   - develop
   - helpfullinks-own-block
   - keep-showing-submenu
   - master
Branch name for production releases: [master] 
Which branch should be used for integration of the "next release"?
   - develop
   - helpfullinks-own-block
   - keep-showing-submenu
Branch name for "next release" development: [develop] 
How to name your supporting branch prefixes?
Feature branches? [feature/] 
Release branches? [release/] 
Hotfix branches? [hotfix/] 
Support branches? [support/] 
Version tag prefix? []