Labs/Jetpack/FlightDeck/Code Workflow: Difference between revisions

From MozillaWiki
< Labs‎ | Jetpack‎ | FlightDeck
Jump to navigation Jump to search
(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

Draft-template-image.png THIS PAGE IS A WORKING DRAFT Pencil-emoji U270F-gray.png
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.
Git-workflow.png

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