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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
