Hi, I'm having some weird problem with Git on Cygwin on Windows XP. I start with a totally clean repo, and then run interactive rebase to edit a historical commit. I exit the editor without doing anything (I get similar issues if I modify stuff inside the editor). $ git st # On branch master nothing to commit (working directory clean) $ git rebase -i 4a1552c81b622f85b0e9170c6fd7a22b4a3e633c error: git checkout-index: unable to create file util/stringfuncs.cpp (File exists) fatal: Could not reset index file to revision '4965936'. error: Entry 'util/boink-py.cc' not uptodate. Cannot merge. fatal: merging of trees 0c27b10e163f00655486976896d096302b0f5c21 and 7c7dfd93d678cfc564649738d45260e0b5d9f5a7 failed Could not apply d9c7ac9... Various reorganizations. Any clues? Thanks, Ludde -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
