Subject: git weird pulling issue

From: Cyrill Gorcunov <[email-masked]>
Date: Thu, 3 Jan 2008 15:11:14 +0300

Hi git-list,

i've a weird problem with pulling remote tree. look i've linus's tree
as a base repo. then i've created x86 branch to which i pulled
ingo's x86 tree. So all further pulling is made over this branch.
And even having '--force' option at moment of pulling changes from
Ingo's tree i've got something like that:

---
cyrill@cvg linux-2.6-x86.git $ ./git-update.sh 
Updating "x86"
remote: Generating pack...
remote: Done counting 15 objects.
Result has 9 objects.
remote: Deltifying 9 objects...
remote: /9) done/9) done
remote: Total 9 (delta 7), reused 3 (delta 1)
Unpacking 9 objects...
 100% (9/9) done
Auto-merged include/asm-x86/msr.h
CONFLICT (content): Merge conflict in include/asm-x86/msr.h
Auto-merged include/linux/ptrace.h
Auto-merged kernel/ptrace.c
Automatic merge failed; fix conflicts and then commit the result.
---

I would really appreciate if someone helps me to resolve this
problem. If you need an additional info - just mail me.

Please Cc me 'case i'm not subscribed to the list.

Thanks in advance,

		- Cyrill -