From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Olivier B." Subject: git fatal error Date: Fri, 12 Mar 2010 13:58:06 +0100 Message-ID: <4B9A3A5E.4020503@daevel.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 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 ? Thanks, Olivier