git - error: addinfo_cache failed for path 'file' : <p>When I try to merge any branch in git into master I get <code>error: addinfo_cache failed for path 'file'</code>.</p>

<p>What I do:</p>

<pre><code>&gt;git checkout master
&gt;git merge other-branch
</code></pre>

<p>Git gives me:</p>

<pre><code>error: addinfo_cache failed for path 'file'
file: unmerged (581c47f7d0e1a0bc825d528d9783ac18ee0cce27)
file: unmerged (26a0c24dccd2bc2f74e20488ca01bba2fcd9cf56)
file: unmerged (3be471ca5c689693339827a455f187814677642f)
fatal: git write-tree failed to write a tree
</code></pre>

<p><code>&gt;git status</code> yields:</p>

<pre><code>On branch master
Your branch is up-to-date with 'origin/master'.
Unmerged paths:
  (use "git reset HEAD &lt;file&gt;..." to unstage)
  (use "git add &lt;file&gt;..." to mark resolution)

        both modified:   file

no changes added to commit (use "git add" and/or "git commit -a")
</code></pre>

<p>I have no idea what to do and can't find anython on the problem.</p>
