From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox <barebox@lists.infradead.org>
Subject: git pull failed: CONFLICT
Date: Wed, 18 Jan 2012 23:02:06 +0400 [thread overview]
Message-ID: <CAA4bVAFwebYGAq5dB+0CkS3nEc3P5poFAphdw4vZTNNMUkTsmQ@mail.gmail.com> (raw)
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
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2012-01-18 19:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-18 19:02 Antony Pavlov [this message]
2012-01-19 8:19 ` Uwe Kleine-König
2012-01-19 8:44 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAA4bVAFwebYGAq5dB+0CkS3nEc3P5poFAphdw4vZTNNMUkTsmQ@mail.gmail.com \
--to=antonynpavlov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox