From: Koen Kooi <k.kooi@student.utwente.nl>
To: openembedded-devel@openembedded.org
Subject: Re: [PATCH] sg3-utils: get 1.24 to cross compile
Date: Wed, 04 Feb 2009 09:00:45 +0100 [thread overview]
Message-ID: <gmbhvd$8sm$1@ger.gmane.org> (raw)
In-Reply-To: <a7f8874a0902032245v333a379dq179c5bd7369f5dde@mail.gmail.com>
On 04-02-09 07:45, Hans Henry von Tresckow wrote:
> Please review this patch and push if OK
>
> -<<<<<<< HEAD:packages/sg3-utils/sg3-utils_1.24.bb
>
> -=======
> ->>>>>>> c92bef17d2a35e06ec6edc2439918c88a7b4808b:packages/sg3-utils/sg3-utils_1.24.bb
This highlights one of the braindead things of git: it leave inline
conflict markers in your code without telling you, breaking things left
and right.
Anyway... those conflict markers aren't in OE, so please generate your
patch against a clean tree.
regards,
Koen
next prev parent reply other threads:[~2009-02-04 8:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 6:45 [PATCH] sg3-utils: get 1.24 to cross compile Hans Henry von Tresckow
2009-02-04 8:00 ` Koen Kooi [this message]
2009-02-04 8:35 ` Hans Henry von Tresckow
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='gmbhvd$8sm$1@ger.gmane.org' \
--to=k.kooi@student.utwente.nl \
--cc=openembedded-devel@lists.openembedded.org \
--cc=openembedded-devel@openembedded.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.