Due to a ransomware attack, the wiki was reverted to a July 2022 version. . We apologize for the lack of a more recent valid backup.
...
- 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.
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
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
Resolve conflicts. Resolve all conflicts related to the rebase
Code Block language text vi myBrokenFile.txt
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
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
submit review.
Code Block language bash git review
...