git pull failed: CONFLICT

[Antony Pavlov]

Hi!

As usual as usual I tried to pull next branch from
git://git.pengutronix.de/git/barebox, but got error message.

$ git checkout next$ git pullremote: Counting objects: 287,
done.remote: Compressing objects: 100% (121/121), done.remote: Total
193 (delta 164), reused 85 (delta 67)Receiving objects: 100%
(193/193), 22.10 KiB, done.Resolving deltas: 100% (164/164), completed
with 69 local objects.From git://git.pengutronix.de/git/barebox +
5c6b5d4...5f77a0a next       -> origin/next  (forced update) +
f4a3223...841b071 work/omap3 -> origin/work/omap3  (forced update) +
5c50a9a...0233427 work/thumb2 -> origin/work/thumb2  (forced
update)Auto-merging common/KconfigCONFLICT (content): Merge conflict
in common/KconfigRemoving arch/arm/mach-omap/omap3_platform.SRemoving
arch/arm/mach-omap/omap3_clock_core.SRemoving
arch/arm/mach-omap/include/mach/board.hRemoving
arch/arm/boards/phycard-a-l1/lowlevel.cAuto-merging MakefileCONFLICT
(content): Merge conflict in MakefileAutomatic merge failed; fix
conflicts and then commit the result.
$ git diffdiff --cc Makefileindex a61138e,5cf49da..0000000---
a/Makefile+++ b/Makefile@@@ -659,13 -669,7 +669,17 @@@
OBJCOPYFLAGS_barebox.bin = -O binar    barebox.bin: barebox FORCE
  $(call if_changed,objcopy)++<<<<<<< HEAD +      @size=`stat -c%s
$@`; \ +      max_size=`printf "%d" $(CONFIG_BAREBOX_MAX_IMAGE_SIZE)`;
\ +      if [ $$size -gt $$max_size ] ; \ +      then \ +
echo "$@ size $$size > of the maximum size $$max_size";  +
 exit 1 ; \ +      fi++=======+       $(call
cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE))++>>>>>>>
5f77a0a812ee44389cd2921e28ee534df9994601    ifdef CONFIG_X86
barebox.S: bareboxdiff --cc common/Kconfigindex
1b47664,8089061..0000000--- a/common/Kconfig+++ b/common/Kconfig@@@
-110,7 -110,6 +110,10 @@@ config BAREBOX_MAX_IMAGE_SIZ        default
0xffffffff        help          Define the maximum size of
barebox++<<<<<<< HEAD +        If 0x0 the size will not been
check++=======++>>>>>>> 5f77a0a812ee44389cd2921e28ee534df9994601
config HAVE_CONFIGURABLE_MEMORY_LAYOUT        bool
-- 
Best regards,
  Antony Pavlov