e of conflicts, cleanly merged
paths are already staged to be committed for you, and paths that
conflicted are left in unmerged state.  You would have to first
check which paths are conflicting with <em>git status</em>
and after fixing them manually in your working tree, you would
stage the result as usual with <em>git add</em>:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git status | grep unmerged
unmerged: hello.c
$ edit hello.c
$ git add hello.c</pre>
</div>
</div>
<div class="para