From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
To: "Slater, Joseph" <joe.slater@windriver.com>
Cc: "openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: Re: master-next
Date: Mon, 14 Aug 2017 15:17:36 -0500 [thread overview]
Message-ID: <1502741856.28941.25.camel@linux.intel.com> (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?
this branch is the what at some point will be landed to master, pretty
dynamic and only created/used by key maintainers (RP, Ross) and consumed
by the auto-builder.
> 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.
use 'git fetch' instead. This will just update your branches but wont
try any merge/rebase.
> 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?
>
>
>
> Joe
>
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
next prev parent reply other threads:[~2017-08-14 20:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 19:24 master-next Slater, Joseph
2017-08-14 20:17 ` Leonardo Sandoval [this message]
2017-08-14 21:44 ` master-next Richard Purdie
2017-08-14 21:53 ` master-next Khem Raj
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=1502741856.28941.25.camel@linux.intel.com \
--to=leonardo.sandoval.gonzalez@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox