davesag/transitioning-to-git-flow.md

Created March 7, 2016 05:20

Star (1) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/davesag/1d935bee3a25d82e2a30.js"></script>
Save davesag/1d935bee3a25d82e2a30 to your computer and use it in GitHub Desktop.

Download ZIP

Transitioning to Git Flow — a primer.

Raw

transitioning-to-git-flow.md

Transitioning to git-flow.

Set up GitHub

create a develop branch
in settings => branches choose develop as the default branch and click update
also in settings => branches choose to protect the master branch.

Udate your clone of your fork

In your terminal, in the project folder:

git fetch upstream to from your master branch to sync your fork with the upstream.
git checkout -b develop to create your local develop branch
git pull upstream develop to pull down the changes
git push -u origin develop to connect your local branch to your fork

Then run git flow init and accept the defaults:

> git flow init

Which branch should be used for bringing forth production releases?
   - master
   - develop
Branch name for production releases: [master] 
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? []

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment