RDK Resources
[*RDK Preferred*]
Code Management Facility
RDK Forums
[RDK Conferences]
RDK Support
Archives
Papers & Presentations Archive
...
Changeset needs to be reworked
Panel |
---|
git fetch https://user@code.rdkcentral.com/r/component1 refs/changes/02/2/1 && git checkout FETCH_HEAD |
...
A new patch set is now appended to the Gerrit review item, and this will go through the same review process as before.
Gerrit conflict resolution
Panel |
---|
git checkout -b topic_branch [Edit the conflicting file, cleaning up the <<<<, ==== >>> markers surrounding the conflicting lines]
|
...
Submit change
Submit change
...