title: How to manage a Git merge conflict with xlsx (binary)?
body: <p>How to manage a Git merge conflict with xlsx (binary)?</p>
  
  <p>It requested to fix the conflict:</p>
  
  <pre><code>$ git merge  
  warning: Cannot merge binary files: proj/data/specs.xlsx (HEAD vs. 
  refs/remotes/origin/master)
  Auto-merging proj/data/specs.xlsx
  CONFLICT (content): Merge conflict in proj/data/specs.xlsx
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>I want get the <code>origin/master</code> version of the file</p>
  
  <pre><code>git add proj/data/specs.xlsx; git commit
  </code></pre>
  
  <p>it keep my local version of the file.</p>
  
  <p>If I checkout the file I get this error:</p>
  
  <pre><code>$ git checkout labor_um/data/UM_specs.xlsx
  error: path 'labor_um/data/UM_specs.xlsx' is unmerged
  </code></pre>