Confirmed users
3,816
edits
Auto-tools/Projects/Mozmill/RepoSetup: Difference between revisions
Auto-tools/Projects/Mozmill/RepoSetup (view source)
Revision as of 05:11, 27 July 2010
, 27 July 2010→Ready to Push
No edit summary |
|||
| Line 69: | Line 69: | ||
Ok, you've gotten your review, your commits are in good shape, and your commit message is correct, then you're ready to push! | Ok, you've gotten your review, your commits are in good shape, and your commit message is correct, then you're ready to push! | ||
<pre> | <pre> | ||
git checkout master | git checkout master // Switch to master branch | ||
git pull --rebase mozauto master // Ensure your master is up to date: see below... | git pull --rebase mozauto master // Ensure your master is up to date: see below... | ||
git merge myfeature | git merge myfeature // Merges your commits to the master | ||
git push origin master | git push origin master // Pushes to your fork | ||
git push mozauto master | git push mozauto master // Pushes to mozautomation master | ||
// PARTY! | |||
</pre> | </pre> | ||
You only need to do pull --rebase if your main master branch is NOT clean. If you have changes on master then this will ensure those changes are applied properly with changes coming downstream from the mozauto master. If the master branch is clean, doing pull --rebase doesn't hurt anything, so it's the recommended step. | You only need to do pull --rebase if your main master branch is NOT clean. If you have changes on master then this will ensure those changes are applied properly with changes coming downstream from the mozauto master. If the master branch is clean, doing pull --rebase doesn't hurt anything, so it's the recommended step. | ||