From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Antony Pavlov <antonynpavlov@gmail.com>
Cc: barebox <barebox@lists.infradead.org>
Subject: Re: git pull failed: CONFLICT
Date: Thu, 19 Jan 2012 09:19:14 +0100 [thread overview]
Message-ID: <20120119081914.GE4066@pengutronix.de> (raw)
In-Reply-To: <CAA4bVAFwebYGAq5dB+0CkS3nEc3P5poFAphdw4vZTNNMUkTsmQ@mail.gmail.com>
Hello Antony,
On Wed, Jan 18, 2012 at 11:02:06PM +0400, Antony Pavlov wrote:
> 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.
As Sascha rewrote the next branch pulling makes your tree base on the
old and the new next branch. You want to do:
git remote update origin
git rebase --onto origin/next origin/next@{1}
assuming your tree based on the version of origin/next before you
git remote updated.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-01-19 8:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-18 19:02 Antony Pavlov
2012-01-19 8:19 ` Uwe Kleine-König [this message]
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=20120119081914.GE4066@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=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