Re: 2.6.git checkout error

[Willy Tarreau]

On Thu, Jan 05, 2006 at 11:11:27AM -0600, Alejandro Bonilla wrote:
> 
> receiving file list ... done
> 
> sent 121 bytes  received 922 bytes  695.33 bytes/sec
> total size is 103831840  speedup is 99551.14
> * committish: db9edfd7e339ca4113153d887e782dd05be5a9eb  HEAD from
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> Updating from 88026842b0a760145aa71d69e74fbc9ec118ca44 to
> db9edfd7e339ca4113153d887e782dd05be5a9eb.
> fatal: Entry 'Makefile' not uptodate. Cannot merge.
> debian:~/linux-2.6#

I believe you have local modifications in your makefile that have not
been committed nor reverted. Do a git-diff, you should not see anything
before the merge.

> .Alejandro

Willy

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/