Confirmed users
471
edits
(shuffle master-side commitA/commitB/tag to commitB/tag/commitA, should make the history easier to follow) |
(consolidate the two stabilization changes) |
||
| Line 125: | Line 125: | ||
If there are merge conflicts, resolve them, then commit the merge. | If there are merge conflicts, resolve them, then commit the merge. | ||
Change the Firefox minVersion/maxVersion compatibility identifiers on the stabilization branch per the [[Jetpack/Development Process]]. | |||
Commit the changes: | |||
git commit -a -m"update Firefox minVersion/maxVersion to anticipated current/next versions of Firefox" | |||
Change back to the master branch: | Change back to the master branch: | ||
| Line 151: | Line 157: | ||
git commit -a -m"update Firefox minVersion/maxVersion to aurora/central versions of Firefox" | git commit -a -m"update Firefox minVersion/maxVersion to aurora/central versions of Firefox" | ||
Push the changes to the canonical repository: | Push the changes to the canonical repository: | ||