Page History

...

1. Find the checkout.  The checkout link can be found on the patch page in the Gerrit web interface.  In the top right, there is a Download option.  Copy the text in the Checkout field.
    
   

2. Checkout the patchset. This checks out the patch set at the most recent patch number.

   Code Block
   language text
   git fetch ssh://username@gerrit.onosproject.org:userid/onos refs/changes/18/18118/7 && git checkout FETCH_HEAD

3. Rebase.  

   Code Block
   language bash
   git fetch origin master git rebase origin/master

4. Resolve conflicts. Resolve all conflicts related to the rebase

   Code Block
   language text
   git status # if there are files in red, they need to be modified because there is a conflict vi myBrokenFile.txt

5. Add files to prepare for commit. If there are additional files you would like to add to this review, they can be added in this step

   Code Block
   language bash
   git add myBrokenFile.txt git add myOtherFile.txt

6. Commit --amend. 

   Code Block
   language bash
   # If conflicts were resolved, you will need to --continue the rebase git rebase --continue # Finally amend your commit git commit --amend

7. submit review. 

   Code Block
   language bash
   git review

...