I ran into this git error again today:

<code>
Entry 'blah/blah.rb' would be overwritten by merge. Cannot merge.
</code>

After messing around with it for a while, I remembered the last time this happened. The solution is to commit your current conflicting changes, then merge afterwards.