 the resulting commit.  However, their changes are not lost&#8201;&#8212;&#8201;they are still staged and merely held back.  After the above
sequence, if you do:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git commit</pre>
</div>
</div>
<div class="paragraph">
<p>this second commit would record the changes to <code>hello.c</code> and
<code>hello.h</code> as expected.</p>
</div>
<div class="paragraph">
<p>After a merge (initiated by <em>git merge</em> or <em>git pull</em>) stops
becaus