Confirmed users
471
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
compare master and stabilization after the merge, look for artifacts
(compare master and stabilization after the merge, look for artifacts) |
|||
| Line 124: | Line 124: | ||
git merge master | git merge master | ||
If there are merge conflicts, resolve them, then commit the merge. | 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: | ||
git diff master stabilization | |||
Change the Firefox minVersion/maxVersion compatibility identifiers on the stabilization branch per the [[Jetpack/Development Process]]. | Change the Firefox minVersion/maxVersion compatibility identifiers on the stabilization branch per the [[Jetpack/Development Process]]. | ||