Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

$ git push origin HEAD:refs/for/rdk-next<branch>

When interfacing with Gerrit you push to a virtual branch /refs/for/<branch>, representing "code review before submission to branch". Gerrit will subsequently assign a unique URL for the change, to facilitate access and review via the web UI.

...

$ git commit --amend
$ git push origin HEAD:refs/for/rdk-next<branch>

A new patch set is now appended to the Gerrit review item, and this will go through the same review process as before.

...

Note: A summary of the steps involved, assuming the local branch still exists: 
Rebase the local branch to the latest state of origin/rdk-next<branch>; Resolve all conflicts; Commit with the `--amend` option; Push changes to Gerrit for review. After this change a new patch set is created for the change.

...

$ git fetch https://user@code.rdkcentral.com/r/rdk_component_1 refs/changes/58/58/2 && git checkout FETCH_HEAD
$ git rebase origin/rdk-next<branch>
[Edit the conflicting file, cleaning up the <<<<, ==== >>> markers surrounding the conflicting lines]
$ git add <file>
$ git commit --amend
$ git push origin HEAD:refs/for/rdk-next<branch>