lass="colist arabic">
<ol>
<li>
<p>apply the change that would be shown by <code>git show topic^</code>.
In this example, the patch does not apply cleanly, so
information about the conflict is written to the index and
working tree and no new commit results.</p>
</li>
<li>
<p>summarize changes to be reconciled</p>
</li>
<li>
<p>cancel the cherry-pick.  In other words, return to the
pre-cherry-pick state, preserving any local modifications
you had in the working tree.</p>
</li>
<li>
<p>try to apply the change