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

From MozillaWiki
< Labs‎ | Jetpack‎ | FlightDeck
Jump to navigation Jump to search
(we host the workflow diagram on github)
 
(10 intermediate revisions by the same user not shown)
Line 1: Line 1:
{{draft}}
[[File:git-workflow.png|200px|thumb|right]]
[[File:git-workflow.png|200px|thumb|right]]
= 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 [[Labs/Jetpack/FlightDeck/Contribution|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
[[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 nview.com - A successful Git branching 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

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

Retrieved from "https://wiki.mozilla.org/index.php?title=Labs/Jetpack/FlightDeck/Code_Workflow&oldid=240378"