<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
# Check out the 2.0 branch<br>
BRANCH=r/stx.2.0<br>
repo init -u <a class="moz-txt-link-freetext" href="https://opendev.org/starlingx/manifest">https://opendev.org/starlingx/manifest</a> -b $BRANCH<br>
repo sync --force-sync
<p><br>
</p>
# change directory to the destination repo and start a working
branch. e.g. <br>
cd cgcs-root/stx/stx-integ<br>
repo start my-branch<br>
<p><br>
</p>
<p># a) Normal case. The commit is already commited on the master
branch</p>
# Find the sha of the commit you wish to cherry pick<br>
git log remotes/starlingx/master
<p> git cherry-pick <sha></p>
<p><br>
</p>
<p># b) The commit is still under review in gerrit<br>
</p>
# Point your browser at the review e.g.
<a class="moz-txt-link-freetext" href="https://review.opendev.org/#/c/674719/">https://review.opendev.org/#/c/674719/</a><br>
# In the upper right hand corner find the 'Download' button to
expand the sub-menu.<br>
# Find the 'cherry-pick' option. On the right you'll find a
button that fill copy cherry pick commands to your clip-board.<br>
# Paste the cherry pick commands into your shell. It will look
something like ...<br>
git fetch <a class="moz-txt-link-freetext" href="https://review.opendev.org/starlingx/integ">https://review.opendev.org/starlingx/integ</a>
refs/changes/19/674719/1 && git cherry-pick FETCH_HEAD
<p><br>
</p>
<p># You cherry-pick might not apply cleanly. If there is a
conflict ...</p>
# Edit files that report conflicts.<br>
vi <file><br>
<br>
# Look for conflict markers '<<<<<<<' and
'>>>>>>>' that show the competing changes.<br>
# Resolve the conflict and remove the conflict markers.<br>
<br>
# save changed<br>
'git add <file>'<br>
<br>
# resume the cherry-pick<br>
git cherry-pick --continue
<p><br>
</p>
<p># Test your change</p>
<p><br>
</p>
# Submit for review<br>
git review -s<br>
git review<br>
<p><br>
</p>
<p><br>
</p>
<pre></pre>
</body>
</html>