David Aguilar schrieb: > On Fri, Sep 04, 2009 at 10:28:36PM +0200, Christoph Haas wrote: >> Now I imported a new upstream version into the upstream branch. And then >> tried to merge the 'upstream' branch into the 'master' branch to work on >> it. And suddenly I get this error: >> >> error: Entry 'cream-abbr-eng.vim' would be overwritten by merge. >> Cannot merge. >> >> To reproduce my problem: >> >> $> git clone git://git.workaround.org/cream >> $> cd cream >> $> git merge origin/upstream >> error: Entry 'cream-abbr-eng.vim' would be overwritten by merge. >> Cannot merge. >> fatal: merging of trees 70008c82f82a7985531aa2d039c03fdf944ea267 and >> 78d3a35e300434d6369424dd873bb587beacfaa4 failed > > Very odd indeed! > > $ git version > git version 1.6.4.2.264.g79b4f > > I was able to workaround it: > > $ rm * > $ git add -u > $ git merge origin/upstream Thank you. I had to "rm -r addons", too, but the general hint helped me a lot. > I've never run into this before. > I think it has to do with all the renamed files. > It looks like you're running into ain unfortunate edge case. Actually I'm not aware of any renames. But I don't claim that I always know what I'm doing. :) > Does anyone else on the list have any insights? I'd be curious, too. Kindly Christoph -- 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