merge conflicts during git pull
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.
Signature · 8 lines
Regards, Andre MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
Dear Andre,
Quoted 3 lines · In message <[email protected]> you wrote:
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).
...
Quoted 3 lines
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 :
...
Quoted 3 lines
Have I missed anything ?
Is there a way to get automagically merged whatever there might be to merge ?
Sorry, I have no idea what happenend of your system. I can see no issues on our side.
Here is what the top of tree of the master branch should look like for you:
==> (HEAD, origin/master, origin/HEAD, custodians/master, custodians/HEAD, master)
494a7d2 2011-02-09 21:22:58 +0100 Merge branch 'master' of git://git.denx.de/u-boot-nand-flash 65b57eb 2011-02-09 20:54:53 +0100 Merge branch 'next' of git://git.denx.de/u-boot-nios fced09a 2011-02-09 20:50:26 +0100 Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx eef1d71 2011-02-08 15:25:02 -0600 NAND: env: remember the flags used in the previous environment d8a593c 2011-02-08 08:29:53 -0500 nios2: add gpio_is_valid 85debef 2011-02-08 08:29:53 -0500 nios2: use long for ssize_t df8f125 2011-02-08 08:29:53 -0500 altera_spi: add spi_set_speed e91d545 2011-02-08 08:29:53 -0500 nios2: add gpio_free 2da0fc0 2011-02-07 11:13:16 +0100 ppc4xx: Add DLVision-10G board support 8d4addc 2011-02-06 22:41:53 +0100 Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx 367c665 2011-02-06 22:39:50 +0100 Merge branch 'master' of git://git.denx.de/u-boot-usb e9e481f 2011-02-06 22:28:34 +0100 Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx 26e5f79 2011-02-05 17:06:57 -0600 mpc83xx: Use correct register to calculate clocks. 10fa8d7 2011-02-05 17:01:52 -0600 mpc83xx: fix pcie configuration space read/write ce297a8 2011-02-05 13:54:51 +0100 USB: Change the necessary defines to get debug output cb44091 2011-02-05 13:54:51 +0100 USB: Fix device stati for removable and powerctrl (typo) f69b980 2011-02-04 21:44:46 +0100 Merge branch 'master' of git://git.denx.de/u-boot-nand-flash 04a641d 2011-02-04 14:04:21 -0600 powerpc/8xxx: Fix possible compile issue related to P1013 4bfa18f 2011-02-04 20:38:27 +0100 Merge branch 'master' of git://git.denx.de/u-boot-sh d34897d 2011-02-03 02:46:13 -0600 powerpc/85xx: Enable ECC on MPC8572DS 9167191 2011-02-03 02:46:13 -0600 powerpc/mpc85xx: implement workaround for errata DDR111 and DDR134 eb0aff7 2011-02-03 02:46:13 -0600 powerpc/85xx: Rename MPC8572 DDR erratum to DDR115 67f9447 2011-02-03 02:46:13 -0600 powerpc/85xx: Enable Errata command on MPC8572DS e1df0de 2011-02-03 02:46:12 -0600 powerpc/85xx: Remove unnecessary polling loop from DDR init 5103a03 2011-02-03 02:46:12 -0600 fsl_esdhc: Add the workaround for erratum ESDHC-A001 (enable on P2020) 6e7f0bc 2011-02-03 02:46:12 -0600 powerpc/85xx: Enable ESDHC111 Erratum on P2010/P2020 SoCs e72f467 2011-02-03 16:54:19 +0900 sh: sh7785lcr: Fix out of tree building 920a5dd 2011-02-02 16:14:08 -0600 NAND: Fix saving of redundand environment
==> (v2011.03-rc1)
42d44f6 2011-02-02 22:37:32 +0100 Prepare v2011.03-rc1
...
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de For every complex problem, there is a solution that is simple, neat, and wrong. - Mark Twain
Wolfgang,
....
Quoted 5 lines
Quoted 3 lines
Have I missed anything ?
Is there a way to get automagically merged whatever there might be to merge ?Sorry, I have no idea what happenend of your system. I can see no issues on our side.
thank - will clone a new repo an pull in my local branches.
Signature · 8 lines
Regards, Andre MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
Le 14/02/2011 10:05, Andre Schwarz a ?crit :
Quoted 11 lines
Wolfgang,
....
Quoted 5 lines
Quoted 3 lines
Have I missed anything ?
Is there a way to get automagically merged whatever there might be to merge ?Sorry, I have no idea what happenend of your system. I can see no issues on our side.
thank - will clone a new repo an pull in my local branches.
Just a side note: I tend to prefer git fetch over git pull, because I am sure that I don't affect my working branch unless I really want to, at which point I do it voluntarily and in a controlled manner, through git rebase or git merge, and even then, I often tag my branch beforehand so that I cen easily double-check the actions and revert them as/if needed.
Amicalement,
Signature · 1 line
Albert.