Confirmed users
396
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
→Merge Master to Stabilization
Canuckistani (talk | contribs) (Undo revision 443169 by Canuckistani (talk)) |
|||
| Line 127: | Line 127: | ||
git checkout stabilization | git checkout stabilization | ||
git merge --no-commit master | git merge --no-commit master | ||
# resolve conflicts, if any | # resolve conflicts, if any (don't resolve install.rdf yet!) | ||
git commit -m "merge master into stabilization to start the N.N release cycle" | git commit -m "merge master into stabilization to start the N.N release cycle" | ||