title: How to override unmerged git checkout with upstream version
body: <p>I’m attempting to revert a file modified locally to the version that is most recent upstream, effectively undoing my changes.</p>
  
  <pre><code>$ git checkout --  Jovie/Jovie-Info.plist
  error: path ‘Jovie/Jovie-Info.plist' is unmerged
  </code></pre>
  
  <p>Using -f alters the error to warn, but still won’t make the change (???)</p>
  
  <pre><code>$ git checkout  -f -- Jovie/Jovie-Info.plist
  warning: path ‘Jovie/Jovie-Info.plist' is unmerged
  </code></pre>
  
  <p>The file itself looks like this:</p>
  
  <pre><code>$ git diff Jovie/Jovie-Info.plist
  diff --cc Jovie/Jovie-Info.plist
  index 6c576d9,0209baa..0000000
  --- a/Jovie/Jovie-Info.plist
  +++ b/Jovie/Jovie-Info.plist
  @@@ -50,7 -50,7 +50,11 @@@
                  &lt;/dict&gt;
          &lt;/array&gt;
          &lt;key&gt;CFBundleVersion&lt;/key&gt;
  ++&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream
   +      &lt;string&gt;5922&lt;/string&gt;
  ++=======
  +       &lt;string&gt;5918&lt;/string&gt;
  ++&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
          &lt;key&gt;Fabric&lt;/key&gt;
          &lt;dict&gt;
                  &lt;key&gt;APIKey&lt;/key&gt;
  </code></pre>
  
  <p>How do I override the local files and apply upstream changes?</p>