|
|
| Line 438: |
Line 438: |
|
| |
|
| Update the IRC topic on #jetpack to announce the new release. | | Update the IRC topic on #jetpack to announce the new release. |
|
| |
| == Merge Release back into Stabilization ==
| |
|
| |
| (NOTE: warner thinks this step can/should be omitted, starting with the 1.5 release. Check with him before executing it.)
| |
|
| |
| To ensure that future releases go smoothly, after each release, the "release"
| |
| branch should be merged back into stabilization. This should usually be a
| |
| fast-forward merge.
| |
|
| |
| Clone the canonical repository and enter its working directory:
| |
|
| |
| git clone git@github.com:mozilla/addon-sdk.git
| |
| cd addon-sdk
| |
|
| |
| Merge the release branch to the stabilization branch:
| |
|
| |
| git checkout stabilization
| |
| git merge remotes/origin/release
| |
|
| |
| Push the updated stabilization branch to the canonical repository:
| |
|
| |
| git push origin stabilization
| |
|
| |
|
| = Bask = | | = Bask = |