Confirmed users
514
edits
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands: Difference between revisions
Jump to navigation
Jump to search
m
Labs/Jetpack/FlightDeck/Code Workflow/Management Commands (view source)
Revision as of 09:56, 22 July 2010
, 22 July 2010→workflow
m (→workflow) |
m (→workflow) |
||
| Line 33: | Line 33: | ||
Pull the bug-#- branch from developer ''john'' | Pull the bug-#- branch from developer ''john'' | ||
git remote add -t bug-1234-name_of_the_bug john- | git remote add -t bug-1234-name_of_the_bug john-1234-name_of_the_bug git@github.com:john/FlightDeck.git -f | ||
git checkout | git checkout john-1234-name_of_the_bug | ||
Now it's possible to test if the feature is working. If so - merge it into the '''master''' | Now it's possible to test if the feature is working. If so - merge it into the '''master''' | ||
git checkout master | git checkout master | ||
git merge --no-ff | git merge --no-ff john-1234-name_of_the_bug | ||
And delete the branch from your local repository | And delete the branch from your local repository | ||
git branch -d | git branch -d john-1234-name_of_the_bug | ||
Push the master to the main repository | Push the master to the main repository | ||
git push main master | git push main master | ||