Confirmed users
514
edits
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands: Difference between revisions
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands (view source)
Revision as of 12:40, 22 July 2010
, 22 July 2010→workflow
m (→workflow) |
|||
| Line 116: | Line 116: | ||
=== ''workflow'' === | === ''workflow'' === | ||
Merge the remote hotfix branch production or support | 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 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 | git checkout production | ||
git merge --no-ff john-1234-name_of_the_hotfix | git merge --no-ff john-1234-name_of_the_hotfix | ||
git tag -a 1.0a3.1 | |||
git push main production --tags | |||
Delete local branch after usage | Delete local branch after usage | ||
git branch -d john-1234-name_of_the_hotfix | git branch -d john-1234-name_of_the_hotfix | ||