Skip to contentSkip to conversation

2.6.git checkout error

DISCUSSION Alejandro Bonilla 2 participants 2 messages Jan 5, 2006

lore
Share & tools
lore
#0 lore raw

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#

.Alejandro

#1 lore raw
Quoted 11 lines · Alejandro Bonilla

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.

Quoted 1 line

.Alejandro

Willy