Labs/Jetpack/FlightDeck/Code Workflow: Difference between revisions
< Labs | Jetpack | FlightDeck
Jump to navigation
Jump to search
m (→Links) |
(code management commands link) |
||
| Line 29: | Line 29: | ||
If we decide on developing on the master: | If we decide on developing on the master: | ||
# git config gitflow.branch.develop master | # 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 = | ||
Revision as of 15:47, 19 July 2010
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 trunk
- consider renaming devel to 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 final git config gitflow prefix.feature bug
If we decide on developing on the master:
# 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)