Confirmed users
514
edits
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands: Difference between revisions
Jump to navigation
Jump to search
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands (view source)
Revision as of 09:52, 22 July 2010
, 22 July 2010support branches
(release branches added) |
(support branches) |
||
| Line 68: | Line 68: | ||
If this would lead to a conflict resolve it and commit. Release branch is not needed anymore, delete it | If this would lead to a conflict resolve it and commit. Release branch is not needed anymore, delete it | ||
git branch -d release-1.0a3 | git branch -d release-1.0a3 | ||
== support- == | |||
#May branch off from: '''hotfix-#-''' | |||
#May branch into: '''hotfix-#-''' | |||
#Branch naming convention: '''support-1.0a3''' where 1.0a3 is a version of the production | |||
Support branches are created to support old production version. Sometimes a fix for an old version is not compatible with the current production version. We will merge the hotfix into the support branch and tag it with the new version number. | |||
=== ''workflow'' === | |||
branch off from a hotfix branch | |||