![]() | ||||||||||
Messages in this thread |
On Tue, 21 Jun 2005, Dave Airlie wrote: > > fatal: Entry 'Documentation/DocBook/scsidrivers.tmpl' would be overwritten > by merge. Cannot merge. > > but I haven't touched that tree so I shouldn't get merge issues.. > > whatsup? The most common issue is that your index is not in sync. For many operations, that's just goign to slow things down a lot (ie a diff migth take a long time instead of being instantaneous), but for a merge it's considered an error. Does "git-diff-files -p" show any output? That's a dead give-away. Do "git-update-cache --refresh" to make sure your index file matches your working directory. I guess I can make the "git pull" script do that automatically (some other scripts do, like "git commit", which also depends on having an up-to-date index). Linus - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | |||||||||
| Last update: 2005-06-21 15:50 [from the cache] ©2003-2008 | ||||||||||