Difference between revisions of "Development workflow - webdev"

From WormBaseWiki
Jump to navigationJump to search
Line 1: Line 1:
 
This page describes the development model used by the web development team at WormBase using git. This includes our branching strategy and release management.
 
This page describes the development model used by the web development team at WormBase using git. This includes our branching strategy and release management.
  
 +
= Diagram =
 
[[File:Git_Workflow_-_WormBase1.png]]
 
[[File:Git_Workflow_-_WormBase1.png]]
 
[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]
Line 11: Line 12:
 
= Supporting branches =  
 
= Supporting branches =  
 
== feature branches ==
 
== feature branches ==
== hotfixes
+
== hotfixes ==
  
 
= Example Workflow =
 
= Example Workflow =
 
== New Feature ==
 
== New Feature ==
 
== Hotfix to production ==
 
== Hotfix to production ==

Revision as of 19:16, 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.

Diagram

Git Workflow - WormBase1.png Editable version of the diagram

Main branches

Master

Dev

Production

Supporting branches

feature branches

hotfixes

Example Workflow

New Feature

Hotfix to production