Git Cannot Merge? Try committing first.

Git Cannot Merge? Try committing first.

I ran into this git error again today:


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

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.

Comments (View)

Subakva Teknika

Git Cannot Merge? Try committing first.