From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: "Slater, Joseph" <joe.slater@windriver.com>,
"openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: Re: master-next
Date: Mon, 14 Aug 2017 22:44:16 +0100 [thread overview]
Message-ID: <1502747056.13978.40.camel@linuxfoundation.org> (raw)
In-Reply-To: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com>
On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote:
> Is there something “different” about this branch? I find that if I
> have a local master and master-next, and am on master, when I do a
> pull master-next will wind up both ahead and behind origin/master-
> next. If I switch to master-next and rebase, it might fail, or it
> might leave me with one or more “local” commits that are not mine.
> For the case I tried today, it is commit 3d4f241 which seems to only
> be on my local master-next, but came from Mark Horn/Ross Burton on
> August 2.
>
> Can anyone explain this?
master-next rebases. The patch in question was in master-next, it
failed tests and I booted it out until it gets fixed.
master never rebases by comparison.
Cheers,
Richard
next prev parent reply other threads:[~2017-08-14 21:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 19:24 master-next Slater, Joseph
2017-08-14 20:17 ` master-next Leonardo Sandoval
2017-08-14 21:44 ` Richard Purdie [this message]
2017-08-14 21:53 ` master-next Khem Raj
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:55 master-next Alexei Kopendakov
2013-08-28 11:44 ` master-next Daiane Angolini
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=1502747056.13978.40.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=joe.slater@windriver.com \
--cc=openembedded-core@lists.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.