Jetpack/Release Process: Difference between revisions

Jetpack/Release Process (view source)

189 bytes added , 11 January 2012

improve merge-commit message

Confirmed users

471

edits

@@ Line 122: / Line 122: @@
   git checkout stabilization
-  git merge master
+  git merge --no-commit master
+ # resolve conflicts, if any
+ git commit -m "merge master into stabilization to start the N.N release cycle"
-If there are merge conflicts, resolve them, then commit the merge. In general, favor the version coming from the 'master' side, but keep an eye out for changes which somehow appeared on stabilization and *not* on master (perhaps these need to be cherry-picked to master). When done, compare the two trees to check for merge artifacts. The only differences should be in the minVersion/maxVersion fields, that will be changed next:
+If there are merge conflicts, you will need to resolve them first. In general, favor the version coming from the 'master' side, but keep an eye out for changes which somehow appeared on stabilization and *not* on master (perhaps these need to be cherry-picked to master). When done, compare the two trees to check for merge artifacts. The only differences should be in the minVersion/maxVersion fields, that will be changed next:
   git diff master stabilization
+ # only differences should be in install.rdf, minVersion/maxVersion
 Change the Firefox minVersion/maxVersion compatibility identifiers on the stabilization branch per the [[Jetpack/Development Process]].