On Mittwoch, 16. Februar 2011, Piotr Krukowiecki wrote: > I have deleted the whole top-level directory in which the file was and run: > > $ git status | grep <<PATH>> > # deleted: <<PATH>> > > $ git checkout -- <<top dir>> > > $ git status > # On branch master > nothing to commit (working directory clean) > > $ git cherry-pick 7d193bb0c1f14908361d9d9d5e30f0c12d5f2c2f > error: Your local changes to the following files would be overwritten by > merge: <<PATH>> > Please, commit your changes or stash them before you can merge. > Aborting A wild guess: You are on Windows or OS/X, and the file exists in your worktree with different uppercase/lowercase name? Rename the file so that its case is the same as it is recorded in the repository. -- Hannes -- 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