Difference between revisions of "Development workflow - webdev"
From WormBaseWiki
Jump to navigationJump to searchLine 17: | Line 17: | ||
== Supporting branches == | == Supporting branches == | ||
+ | Other types of branches that can be made in the main repository include feature branches and hotfixes. These branches are only intended to live until the new feature is merged into <code>dev</code> or the fix is completed. | ||
+ | |||
=== feature branches === | === feature branches === | ||
=== hotfixes === | === hotfixes === |
Revision as of 20:02, 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
Branch Strategy
Main branches
Inside the WormBase/website
repository, there are three main branches: master
, dev
and production
.
master
: current, stable code. All new changes brought into master have been tested on staging.wormbase.org and approved by either the curator requesting the change, or the development lead.
dev
: any features/changes ready for testing should be pushed to thedev
branch. This code gets pushed nightly to staging.wormbase.org.
production
: the code currently in production. Branched off ofmaster
at each release.
Supporting branches
Other types of branches that can be made in the main repository include feature branches and hotfixes. These branches are only intended to live until the new feature is merged into dev
or the fix is completed.