Edited wiki page Gerrit through web user interface.
diff --git a/Gerrit.wiki b/Gerrit.wiki index 5995514..625021e 100644 --- a/Gerrit.wiki +++ b/Gerrit.wiki
@@ -21,12 +21,29 @@ = Code Review = +== Reviewing your branch == # Create a branch, work on your change, commit your change. # git push-for-review # in the Gerrit web UI, explicitly add at least one reviewer # review happens. # if changes are necessary, commit, rebase, go back to step 2. + +== Syncing and preparing your branch == + # pull the latest changes to master + * git checkout master + * git pull origin master + # rebase your branch on master git rebase master and fix possible conflicts on the way + * git checkout your-branch + * git rebase master + # git push-for-review + # if the rebase cleared the review approvals, ask the reviewers for another look. Otherwise, the changes are almost ready to be submitted + # locally merge your branch into master + * git checkout master + * git merge your-branch + +== Submitting the code == # click submit button in web ui + # push your master branch to code.google.com/p/soc = Interesting Links = https://wiki.openstack.org/wiki/Gerrit_Workflow