thatch45/salt — Issue #236: start using gitflow
Author: markusgattol
Created: 2011-11-15 09:42:19+00:00
State: open

Hi Thomas,

I want to make progress... gitflow is next thing to attack. Here's how to do it... it's trivial as you can see (of course, you don't clone but use the orig repo):

sa@wks:/tmp$ git clone https://github.com/thatch45/salt.git
Cloning into salt...
remote: Counting objects: 7943, done.
remote: Compressing objects: 100% (2398/2398), done.
remote: Total 7943 (delta 5480), reused 7907 (delta 5450)
Receiving objects: 100% (7943/7943), 1.22 MiB | 756 KiB/s, done.
Resolving deltas: 100% (5480/5480), done.
sa@wks:/tmp$ cd salt/; git branch -a
* master
remotes/origin/HEAD -> origin/master
remotes/origin/highstate
remotes/origin/master
(master u=) sa@wks:/tmp/salt$ git flow init -d
Using default branch names.

Which branch should be used for bringing forth production releases?
- master
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? []
(develop) sa@wks:/tmp/salt$ git branch -a
* develop
master
remotes/origin/HEAD -> origin/master
remotes/origin/highstate
remotes/origin/master
(develop) sa@wks:/tmp/salt$ git push -u origin develop

Finally go to github's admin interface for salt and make develop
the default branch. We're done... best of both worlds, stable
master from now on, no more direct pushes to master from now on :)