Confirmed users
396
edits
Canuckistani (talk | contribs) |
(→Panic) |
||
Line 413: | Line 413: | ||
* git tag NEWRELEASE | * git tag NEWRELEASE | ||
* use 'git archive' to create tarballs | * use 'git archive' to create tarballs | ||
* upload tarballs | * upload tarballs (644 permissions!) | ||
* git checkout stabilization | * git checkout stabilization | ||
* git merge release (this may require conflict-resolution) | * git merge release (this may require conflict-resolution) | ||
Line 432: | Line 432: | ||
* git merge --ff-only hotfix | * git merge --ff-only hotfix | ||
* git tag NEWRELEASE | * git tag NEWRELEASE | ||
* make+upload tarballs | * make+upload tarballs (644 permissions!) | ||
* git checkout stabilization | * git checkout stabilization | ||
* git merge official/release (and resolve conflicts) | * git merge official/release (and resolve conflicts) | ||
* git push official NEWRELEASE release stabilization | * git push official NEWRELEASE release stabilization | ||
* git branch -D hotfix | * git branch -D hotfix |