From: Willy Tarreau <willy@w.ods.org>
To: Alejandro Bonilla <abonilla@linuxwireless.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.git checkout error
Date: Thu, 5 Jan 2006 22:20:09 +0100 [thread overview]
Message-ID: <20060105212009.GD7142@w.ods.org> (raw)
In-Reply-To: <20060105170910.M70902@linuxwireless.org>
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
prev parent reply other threads:[~2006-01-05 21:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-05 17:11 2.6.git checkout error Alejandro Bonilla
2006-01-05 21:20 ` Willy Tarreau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060105212009.GD7142@w.ods.org \
--to=willy@w.ods.org \
--cc=abonilla@linuxwireless.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.