From: Ross Burton <ross.burton@intel.com>
To: Elvis Dowson <elvis.dowson@gmail.com>
Cc: McClintock Matthew-B29882 <B29882@freescale.com>,
Yocto Discussion Mailing List <yocto@yoctoproject.org>
Subject: Re: poky git pull merge failures
Date: Sat, 21 Jul 2012 20:54:45 +0100 [thread overview]
Message-ID: <ADFC5DCD3FAB494FAC4EE59C0ED44525@intel.com> (raw)
In-Reply-To: <CF0BA2D7-A20C-4048-8EA0-5BF6E300F8D3@gmail.com>
On Saturday, 21 July 2012 at 20:15, Elvis Dowson wrote:
> I guess I have to reset the meta-openembedded layer as well.
Yes:
ERROR: ParseError at /tool/yocto/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb:60: unparsed line: '<<<<<<< HEAD'
That's a merge conflict marker in a meta-oe file.
"git pull" giving merge problems is user error: you pulled into a branch that diverged from upstream. If you hack on your local master, then do a git fetch and inspect the diff before merging origin/master. A better solution (imho) is to leave local master as pristine, and branch it for any changes.
Ross
next prev parent reply other threads:[~2012-07-21 19:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 18:50 poky git pull merge failures Elvis Dowson
2012-07-21 19:01 ` Elvis Dowson
2012-07-21 19:14 ` McClintock Matthew-B29882
2012-07-21 19:14 ` Elvis Dowson
2012-07-21 19:15 ` Elvis Dowson
2012-07-21 19:54 ` Ross Burton [this message]
2012-07-22 2:02 ` Elvis Dowson
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=ADFC5DCD3FAB494FAC4EE59C0ED44525@intel.com \
--to=ross.burton@intel.com \
--cc=B29882@freescale.com \
--cc=elvis.dowson@gmail.com \
--cc=yocto@yoctoproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.