d                 <b class="conum">(2)</b>
$ git pull . topic/branch          <b class="conum">(3)</b>
Updating from 41223... to 13134...
Fast-forward
$ git reset --hard ORIG_HEAD       <b class="conum">(4)</b></pre>
</div>
</div>
<div class="colist arabic">
<ol>
<li>
<p>Try to update from the upstream resulted in a lot of
conflicts; you were not ready to spend a lot of time merging
right now, so you decide to do that later.</p>
</li>
<li>
<p>"pull" has not made merge commit, so <code>git reset --hard</code