From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web09.4337.1574806132070308322 for ; Tue, 26 Nov 2019 14:08:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: michael.d.kinney@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 14:08:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,247,1571727600"; d="scan'208";a="410130394" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga006.fm.intel.com with ESMTP; 26 Nov 2019 14:08:50 -0800 Received: from orsmsx156.amr.corp.intel.com (10.22.240.22) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 26 Nov 2019 14:08:50 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.200]) by ORSMSX156.amr.corp.intel.com ([169.254.8.101]) with mapi id 14.03.0439.000; Tue, 26 Nov 2019 14:08:49 -0800 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "afish@apple.com" , "Kinney, Michael D" Subject: Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date. Thread-Topic: [edk2-devel] [staging/master]:master on edk2-staging is out of date. Thread-Index: AQHVpKJWiIaaJzoG6k6tl/9zkRxMd6ed/t8Q Date: Tue, 26 Nov 2019 22:08:49 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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-st= aging. 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 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 da= te. I was looking at creating a staging branch to work on=A0Bz2387. The README= =A0[1] for edk2-staging (about branch) mentions that edk2-staging/master t= racks edk2/master, but I see it was last synced in June?=A0 I'm not clear on the process for updating the edk2-staging/master? It is n= ot setup to update on pull. There seems to have been a lot of work on the E= mulatorPkg and I'd like to sync my staging branch with the current master i= f possible?=A0 [1]=A0https://github.com/tianocore/edk2-staging [Step 1 is already completed, it is here for documentation purposes; proce= ed 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