il like this:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git checkout mytopic
error: You have local changes to 'frotz'; not switching branches.</pre>
</div>
</div>
<div class="paragraph">
<p>You can give the <code>-m</code> flag to the command, which would try a
three-way merge:</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git checkout -m mytopic
Auto-merging frotz</pre>
</div>
</div>
<div class="paragraph">
<p>After this three-way merge, the local modifications