Page History

...

$ git branch -D review/[submitter_name]/[branch_name]

Amending Submissions (Rebase to master and/or apply changes)

This option is useful if there are commits in the master that conflict with your changes.

1. Find the checkout.  The checkout link can be found on page the patch 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. Here, we use git commit --amend, instead of generating a new message.

   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
   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
   git commit --amend

7. submit review. 

   Code Block
   language bash
   git review

...

Previous : Contributing to the ONOS Codebase
Next : Contributing to ONOS Documentation

...