Difference between revisions of "Development workflow - webdev"

From WormBaseWiki
Jump to navigationJump to search
Line 33: Line 33:
  
 
= Links =
 
= Links =
[https://github.com/WormBase/website github repository]
+
* [https://github.com/WormBase/website github repository]
[https://github.com/WormBase/website/issues github issue tracker]
+
* [https://github.com/WormBase/website/issues github issue tracker]
[https://docs.google.com/drawings/d/1j-a-8a_hTIqCiMCRLUcemGqEe_c8LXOZKuioHlE9oX4/edit?usp=sharing workflow diagram]
+
* [https://docs.google.com/drawings/d/1j-a-8a_hTIqCiMCRLUcemGqEe_c8LXOZKuioHlE9oX4/edit?usp=sharing workflow diagram]

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

Branch Strategy

Main branches

Inside the WormBase/website repository, there are three main branches: master, dev and production.

master

dev

production

Supporting branches

feature branches

hotfixes

Commits to dev

Merging dev to master

Release Management

Example Workflow

New Feature

New Feature (Large)

Hotfix to production

New production release

Links