Page History

git clone <comcast Gerrit url>  --no-tags --single-branch -b <sprint branch> <project>
cd <project>

# cherry-pick the CMF contributon - go to the CMF change in rdkcentral then click on "Download patch - Cherry-Pick - copy the url"
git fetch <cmf change url/ps> && git cherry-pick FETCH_HEAD 


# resolve the conflicts
git add <conflicted files>
git cherry-pick --continue

#hint: After resolving the conflicts, mark them with
#hint: "git add/rm <pathspec>", then run
#hint: "git cherry-pick --continue".
#hint: You can instead skip this commit with "git cherry-pick --skip".
#hint: To abort and get back to the state before "git cherry-pick",
#hint: run "git cherry-pick --abort".

git commit <-- AT THIS STAGE YOU NEED TO MANUALLY CREATE A RDKCOM TICKET

# add the RDKCOM ticket to the commit message

# push the change to the sprint branch
git --no-pager push origin HEAD:refs/for/<sprint branch> 


Example:
git clone https://gerrit.teamccp.com/rdk/rdkb/components/opensource/ccsp/MeshAgent/generic  --no-tags --single-branch -b 24Q3_sprint MeshAgent
cd MeshAgent

# fetch the CMF change/ps - note this is an example only and may not one an actual conflict
git fetch https://code.rdkcentral.com/r/rdkb/components/opensource/ccsp/MeshAgent refs/changes/14/107314/1 && git cherry-pick FETCH_HEAD

# resolve conflict
git add <files>
git commit --amend

# manually create RDKCOM ticket, add to commit message
git --no-pager push origin HEAD:refs/for/24Q3_sprint

# Once change is pushed to Comcast Gerrit you need to MANUALLY add the RDKCOM and Comcast Gerrit Change as comments in the CMF change and MANUALLY set RS to 5
Comcast JIRA: https://ccp.sys.comcast.net/browse/RDKCOM-<xxxx>
Comcast review:  https://gerrit.teamccp.com/<changeNum>