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 09:28, 22 July 2010
, 22 July 2010release branches added
(Created page with 'This article is inspired by [http://nvie.com/git-model A successful Git branching model]. = Main branches = *master *trunk == master == We use master branch for development c…') |
(release branches added) |
||
| Line 42: | Line 42: | ||
Push the master to the main repository | Push the master to the main repository | ||
git push main master | git push main master | ||
== release- == | |||
#May branch off from: '''master''' | |||
#Must merge back into: '''master''' and '''trunk''' | |||
#Branch naming convention: '''release-1.0a3''' where 1.0a3 is the target production version | |||
Release branches are created after the code is '''frozen'''. They support preparation of a new production release. They allow for minor last-minute bugfixes. By doing all of this work on a release branch, the master branch is cleared to receive features for the next release. | |||
=== ''workflow'' === | |||
Branch off from master | |||
git checkout -b release-1.0a3 | |||
Set version inside the settings and then commit the changes | |||
vi flightdeck/settings.py | |||
git commit flightdeck/settings.py -a "Bumped to version number 1.0a3" | |||
After the release is ready, merge into the production branch | |||
git checkout production | |||
git merge --no-ff release-1.0a3 | |||
Tag the version | |||
git tag -a 1.0a3 | |||
To keep the changes made in the release branch, we need to merge those back into master | |||
git checkout master | |||
git merge --no-ff release-1.0a3 | |||
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 | |||