* 2.6.git checkout error
@ 2006-01-05 17:11 Alejandro Bonilla
2006-01-05 21:20 ` Willy Tarreau
0 siblings, 1 reply; 2+ messages in thread
From: Alejandro Bonilla @ 2006-01-05 17:11 UTC (permalink / raw)
To: linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: 2.6.git checkout error
2006-01-05 17:11 2.6.git checkout error Alejandro Bonilla
@ 2006-01-05 21:20 ` Willy Tarreau
0 siblings, 0 replies; 2+ messages in thread
From: Willy Tarreau @ 2006-01-05 21:20 UTC (permalink / raw)
To: Alejandro Bonilla; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-05 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-05 17:11 2.6.git checkout error Alejandro Bonilla
2006-01-05 21:20 ` Willy Tarreau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox