RDK Resources
[*RDK Preferred*]
Code Management Facility
RDK Forums
[RDK Conferences]
RDK Support
Archives
Papers & Presentations Archive
...
Expand | ||
---|---|---|
| ||
error: generic/devicesettings/generic/: contains uncommitted changes error: generic/rdkbrowser/: branch master is published (but not merged) and is now 11 commits behind error: meta-rdk-oem-X/: contains uncommitted changes
git rebase —abort git rebase rdkgerrit/master ( or rdkgerrit/stable2)
git checkout --ours FILE
grep -lr ‘<<<<<<<<’. | xargs git checkout --ours
git checkout --yours FILE grep -lr ‘<<<<<<<<’. | xargs git checkout –theirs |
...
Expand | ||
---|---|---|
| ||
Please refer Compile-time Build Variants Flags |
...