ven these commits to somebody else.  (See the
"RECOVERING FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>
for the implications of doing so.)</p>
</li>
</ol>
</div>
</dd>
<dt class="hdlist1">Undo a merge or pull</dt>
<dd>
<div class="listingblock">
<div class="content">
<pre>$ git pull                         <b class="conum">(1)</b>
Auto-merging nitfol
CONFLICT (content): Merge conflict in nitfol
Automatic merge failed; fix conflicts and then commit the result.
$ git reset --har