n your
working tree, you can safely say <code>git pull</code> when you know
that the change in the other branch does not overlap with
them.</p>
</li>
<li>
<p>After inspecting the result of the merge, you may find
that the change in the other branch is unsatisfactory.  Running
<code>git reset --hard ORIG_HEAD</code> will let you go back to where you
were, but it will discard your local changes, which you do not
want.  <code>git reset --merge</code> keeps your local changes.</p>
</li>
</ol>
</div>
</dd>
<dt c