Labs/Jetpack/FlightDeck/Code Workflow/Management Commands: Difference between revisions

Labs/Jetpack/FlightDeck/Code Workflow/Management Commands (view source)

1,207 bytes added , 22 July 2010

Confirmed users

514

edits

@@ Line 99: / Line 99: @@
    git tag -a 1.0a3.1
    git push main release-1.0a3 --tags
+== hotfix-#- ==
+#May branch off from: '''production'''
+#Must branch back into: '''support''' or '''production'''
+#May branch back into: '''release''' and '''master'''
+#Branch naming convention: '''hotfix-1234-name_of_the_hotfix''' where 1234 is the bug number in bugzilla
+Hotfix branches are very much like bug-#- branches, albeit unplanned. They are meant to prepare a production or support release. They arise from the necessity to act upon an undesired state of live production version. Hotfix branch may be branched off from the correspondind tag on the production branch that marks the production version.
+Hotfix has to merge back into production (if it's relative to the current production version) or (else) into support- branch.
+If the hotfix is sensible in the current development it may be merged to release or master branch.
+=== ''workflow'' ===
+Merge the remote hotfix branch production or support
+  git remote add -t hotfix-1234-name_of_the_hotfix john-1234-name_of_the_hotfix git@github.com:john/FlightDeck.git -f
+  git checkout production # or support-1.0a3
+  git merge --no-ff john-1234-name_of_the_hotfix
+Delete local branch after usage
+  git branch -d john-1234-name_of_the_hotfix