“Unable to check out” git submodule in Windows only

I saw this problem in Windows (not Linux) running the msysGit bash prompt

bash

  1. git submodule update
  2.  
  3. error: Entry 'README.rdoc' would be overwritten by merge. Cannot merge. Unable to checkout 'fee9487e0d5464fc328f1c9c91eb059fef75988e' in submodule path

Change directories to submodule path and run this to fix it

bash

  1. git reset --hard master

Also grab this iRC client for Windows: http://www.xchat.org and go to the #git channel on the FreeNode server for a lot of good git discussion. This is where I figured out this problem

Share