Labs/Jetpack/FlightDeck/Code Workflow: Difference between revisions
< Labs | Jetpack | FlightDeck
Jump to navigation
Jump to search
m (→Managers) |
m (→Managers) |
||
| (4 intermediate revisions by the same user not shown) | |||
| Line 9: | Line 9: | ||
*branches feature- are renamed to bug-#- where # is a number in bugzilla | *branches feature- are renamed to bug-#- where # is a number in bugzilla | ||
*branches hotfix- are renamed to hotfix-#- | *branches hotfix- are renamed to hotfix-#- | ||
*branch master is renamed to | *branch master is renamed to production | ||
* | *development on master | ||
*main repository is writable for certain group of people only | *main repository is writable for certain group of people only | ||
*personal branches are writable by owners only | *personal branches are writable by owners only | ||
| Line 24: | Line 24: | ||
You may find git-flow useful. If so please change some of the settings: | You may find git-flow useful. If so please change some of the settings: | ||
git config gitflow.branch.master | git config gitflow.branch.master production | ||
git config gitflow prefix.feature bug | git config gitflow prefix.feature bug | ||
git config gitflow.branch.develop master | |||
[[Labs/Jetpack/FlightDeck/Code_Workflow/Management_Commands|Code Management Commands]] for those who want to use pure git. | |||
= Links = | = Links = | ||
*[http://nvie.com/git-model | *[http://nvie.com/git-model nvie.com - A successful Git branching model] | ||
*The diagram is now a part of [http://github.com/zalun/FlightDeck/tree/master/Docs FlightDeck/Docs] in repository | *The diagram is now a part of [http://github.com/zalun/FlightDeck/tree/master/Docs FlightDeck/Docs] in repository | ||
*[http://github.com/nvie/gitflow git-flow] repository of the git extension to make main repository management a blast (not tested yet) | *[http://github.com/nvie/gitflow git-flow] repository of the git extension to make main repository management a blast (not tested yet) | ||
Latest revision as of 14:18, 22 July 2010
|
THIS PAGE IS A WORKING DRAFT | 
|
| The page may be difficult to navigate, and some information on its subject might be incomplete and/or evolving rapidly. If you have any questions or ideas, please add them as a new topic on the discussion page. |
Scrapbook
Differences from Vincent Driessen's model
- long living support branches added
- branches feature- are renamed to bug-#- where # is a number in bugzilla
- branches hotfix- are renamed to hotfix-#-
- branch master is renamed to production
- development on master
- main repository is writable for certain group of people only
- personal branches are writable by owners only
Contributors
Please read Contribution Doc
Topic related: Please branch every fix and make it associated with the bugzilla.
Managers
You may find git-flow useful. If so please change some of the settings:
git config gitflow.branch.master production git config gitflow prefix.feature bug git config gitflow.branch.develop master
Code Management Commands for those who want to use pure git.
Links
- nvie.com - A successful Git branching model
- The diagram is now a part of FlightDeck/Docs in repository
- git-flow repository of the git extension to make main repository management a blast (not tested yet)