Labs/Jetpack/FlightDeck/Code Workflow

	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 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

Links

• nview.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)