Difference between revisions of "Development workflow - webdev"
From WormBaseWiki
Jump to navigationJump to search| Line 6: | Line 6: | ||
[https://docs.google.com/drawings/d/1j-a-8a_hTIqCiMCRLUcemGqEe_c8LXOZKuioHlE9oX4/edit?usp=sharing Editable version of the diagram] | [https://docs.google.com/drawings/d/1j-a-8a_hTIqCiMCRLUcemGqEe_c8LXOZKuioHlE9oX4/edit?usp=sharing Editable version of the diagram] | ||
| − | = Main branches = | + | = Branch Strategy = |
| − | == Master == | + | == Main branches == |
| − | == Dev == | + | === Master === |
| − | == Production == | + | === Dev === |
| + | === Production === | ||
| + | |||
| + | == Supporting branches == | ||
| + | === feature branches === | ||
| + | === hotfixes === | ||
| + | |||
| + | == Commits to dev == | ||
| + | |||
| + | == Merging dev to master == | ||
| − | |||
| − | |||
| − | |||
= Example Workflow = | = Example Workflow = | ||
Revision as of 19:26, 6 March 2013
This page describes the development model used by the web development team at WormBase using git. This includes our branching strategy and release management.
Contents
Diagram
Editable version of the diagram
