[U-Boot] merge conflicts during git pull

[Andre Schwarz <andre.schwarz@matrix-vision.de>]

Wolfgang,

just wanted to update my local U-Boot master branch an got some errors I 
don't understand (since I'm still a git newbie).

This is what I have:

git originally cloned from public repo - thus I have in .git/config :

[remote "origin"]
     fetch = +refs/heads/*:refs/remotes/origin/*
     url = git://www.denx.de/git/u-boot.git


The master branch gets *never* touched.
All my work is done in board specific branches.

"git branch -a" gives :
   M7
   MergerBox
* master
   remotes/origin/HEAD -> origin/master
   remotes/origin/GPL-Cleanup
   remotes/origin/i.MX31
   remotes/origin/lwmon5
   remotes/origin/master
   remotes/origin/next
   remotes/origin/tx25
   remotes/origin/u-boot-2009.11.y


Currently the repo is clean, i.e. everything committed and I did a "git 
co master" and "git pull".
I get a lot of conflicts on files I definitely never touched :


# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#    both modified:      arch/arm/config.mk
#    both modified:      arch/arm/cpu/arm1136/mx35/Makefile
#    both modified:      arch/arm/cpu/arm1176/start.S
#    both modified:      arch/arm/cpu/arm720t/start.S
#    both modified:      arch/arm/cpu/arm920t/start.S
#    both modified:      arch/arm/cpu/arm925t/start.S
#    added by them:      arch/arm/cpu/arm926ejs/armada100/Makefile
#    both modified:      arch/arm/cpu/arm946es/start.S
#    both modified:      arch/arm/cpu/arm_intcm/start.S
#    both modified:      arch/arm/cpu/armv7/omap3/emif4.c
#    both modified:      arch/arm/cpu/ixp/start.S
#    both modified:      arch/arm/cpu/lh7a40x/start.S
#    both modified:      arch/arm/cpu/s3c44b0/start.S
#    both modified:      arch/arm/cpu/sa1100/start.S
#    both modified:      arch/arm/include/asm/arch-mx25/imx-regs.h
#    both modified:      arch/arm/include/asm/arch-mx5/imx-regs.h
#    both modified:      arch/powerpc/config.mk
#    both added:         arch/powerpc/cpu/74xx_7xx/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc512x/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc5xx/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc5xxx/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc8220/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc824x/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc8260/u-boot.lds
#    both modified:      arch/powerpc/cpu/mpc83xx/u-boot.lds
#    both modified:      arch/powerpc/cpu/ppc4xx/u-boot.lds
#    both modified:      arch/powerpc/include/asm/config.h
#    deleted by them:    board/atum8548/atum8548.c
#    added by them:      board/cm_t35/Makefile
#    added by us:        board/dave/PPChameleonEVB/u-boot.lds
#    both modified:      board/davinci/common/misc.c
#    both modified:      board/emk/top9000/Makefile
#    both modified:      board/freescale/corenet_ds/pci.c
#    both deleted:       board/freescale/mpc7448hpc2/u-boot.lds
#    both modified:      board/freescale/mpc8536ds/mpc8536ds.c
#    both modified:      board/freescale/mpc8544ds/mpc8544ds.c
#    both modified:      board/freescale/mpc8548cds/mpc8548cds.c
.....



Have I missed anything ?
Is there a way to get automagically merged whatever there might be to 
merge ?

Any help is welcome.

-- 

Regards,
Andre



MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner