[U-Boot] merge conflicts during git pull

Wolfgang Denk
2011-02-11T19:13:55Z

Dear Andre,

In message <4D555611.2040907@matrix-vision.de> 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).
...
> 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 :
...
> 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

--
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