WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] git fatal error

To: "Olivier B." <xen.list@xxxxxxxxx>
Subject: Re: [Xen-devel] git fatal error
From: Pasi Kärkkäinen <pasik@xxxxxx>
Date: Fri, 12 Mar 2010 15:04:03 +0200
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Fri, 12 Mar 2010 05:04:34 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <4B9A3A5E.4020503@xxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <4B9A3A5E.4020503@xxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.18 (2008-05-17)
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


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>