From: "Olivier B." <xen.list@daevel.fr>
To: xen-devel@lists.xensource.com
Subject: Re: git fatal error
Date: Fri, 12 Mar 2010 14:11:35 +0100 [thread overview]
Message-ID: <4B9A3D87.4000502@daevel.fr> (raw)
In-Reply-To: <20100312130403.GI1878@reaktio.net>
On 12/03/2010 14:04, Pasi Kärkkäinen wrote:
> On Fri, Mar 12, 2010 at 01:58:06PM +0100, Olivier B. wrote:
>
>> Hi,
>>
>> I'm a git noob, and when I do my "git pull" on my local (unmodified)
>> stable-2.6.32.x branch, I obtain this error :
>>
>> ~/linux/linux-xen-2.6.32.x$ git pull
>> remote: Counting objects: 948, done.
>> remote: Compressing objects: 100% (233/233), done.
>> remote: Total 597 (delta 497), reused 420 (delta 351)
>> Receiving objects: 100% (597/597), 109.69 KiB, done.
>> Resolving deltas: 100% (497/497), completed with 118 local objects.
>> From git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
>> * [new branch] xen/blkfront -> origin/xen/blkfront
>> dc23f2c..d02659f xen/dom0/apic-next -> origin/xen/dom0/apic-next
>> b5280ed..772440a xen/dom0/backend/blkback ->
>> origin/xen/dom0/backend/blkback
>> 1ebf91c..7a63455 xen/frontend -> origin/xen/frontend
>> cdab7a0..7d80393 xen/next -> origin/xen/next
>> * [new branch] xen/pvhvm-stefano -> origin/xen/pvhvm-stefano
>> d9dee7a..1181ebb xen/stable -> origin/xen/stable
>> d9dee7a..146259c xen/stable-2.6.32.x -> origin/xen/stable-2.6.32.x
>> error: Entry 'arch/x86/pci/xen.c' not uptodate. Cannot merge.
>> fatal: merging of trees 1d02cb6a2c5ba53936870fdf6e8c3e81e41175b4 and
>> a4c208d5d3eef9d58493fe09c248dada3159376a failed
>> Merge with strategy recursive failed.
>>
>> What is the problem ? And how can I fix it ?
>>
>>
> Try:
>
> git reset --hard
> git pull
>
> -- Pasi
>
>
Thanks Pasi, it works :)
prev parent reply other threads:[~2010-03-12 13:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 12:58 git fatal error Olivier B.
2010-03-12 13:04 ` Pasi Kärkkäinen
2010-03-12 13:11 ` Olivier B. [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=4B9A3D87.4000502@daevel.fr \
--to=xen.list@daevel.fr \
--cc=xen-devel@lists.xensource.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).