Changes

Jump to: navigation, search

Auto-tools/Projects/Mozbase

22 bytes removed, 19:23, 28 May 2013
Landing the patch
Here an example how to land a patch from the '''feature''' branch onto '''master''':
* git pull origin master # make sure master is up to date
* git checkout feature
* git rebase master # make sure patch is a strict descendant of master
* '''TEST''' the patch by [https://wiki.mozilla.org/Auto-tools/Projects/MozBase#Running_the_tests running existent tests]
* git checkout master
* git checkout -b feature* git pull remote feature # or git am patch* '''TEST''' the patch by [https://wiki.mozilla.org/Auto-tools/Projects/MozBase#Running_the_tests running existent tests]* git merge --squash feature* git commit -a -m "Bug XYZ - Add new feature to mozbase; r=reviewer" --author="foo <foo@bar>"
* git push git@github.com:mozilla/mozbase.git master
Confirm
955
edits

Navigation menu