Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date.

["Michael D Kinney" <michael.d.kinney@intel.com>]

Hi Andrew,

The easiest way to create an edk2-staging branch based on the latest edk2/master is to clone edk2-staging and then add edk2 repo as a remote.  Fetch edk2 and checkout edk2/master.  Then create a local branch for Bz2387 based on edk2/master.  When you want to share, push your local branch to edk2-staging.

    git clone https://github.com/tianocore/edk2-staging.git
    cd edk2-staging
    git remote add edk2 https://github.com/tianocore/edk2.git
    git fetch edk2
    git checkout edk2/master -b Bz2387
    git remote remove edk2

    #
    # Make local changes
    #

    #
    # Push new branch to origin (https://github.com/tianocore/edk2-staging.git)
    #
    git push origin Bz2387

Mike

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Andrew Fish via Groups.Io
Sent: Tuesday, November 26, 2019 1:42 PM
To: devel@edk2.groups.io
Subject: [edk2-devel] [staging/master]:master on edk2-staging is out of date.

I was looking at creating a staging branch to work on Bz2387. The README  [1] for edk2-staging (about branch) mentions that edk2-staging/master tracks edk2/master, but I see it was last synced in June? 

I'm not clear on the process for updating the edk2-staging/master? It is not setup to update on pull. There seems to have been a lot of work on the EmulatorPkg and I'd like to sync my staging branch with the current master if possible? 

[1] https://github.com/tianocore/edk2-staging

[Step 1 is already completed, it is here for documentation purposes; proceed to 2)]
1) Create a new repo called edk2-staging
	a) edk2-staging is a fork of edk2
	b) edk2-staging/master tracks edk2/master