From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ma1-aaemail-dr-lapp02.apple.com (ma1-aaemail-dr-lapp02.apple.com [17.171.2.68]) by mx.groups.io with SMTP id smtpd.web11.1593.1574814311940071458 for ; Tue, 26 Nov 2019 16:25:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@apple.com header.s=20180706 header.b=A5soup1r; spf=pass (domain: apple.com, ip: 17.171.2.68, mailfrom: afish@apple.com) Received: from pps.filterd (ma1-aaemail-dr-lapp02.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id xAR0CUtt001162; Tue, 26 Nov 2019 16:25:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=sender : from : content-type : content-transfer-encoding : mime-version : subject : date : references : to : in-reply-to : message-id; s=20180706; bh=MH8Gk1bQna4ml9XC+q/TlD4gs/en7CgfMxucle4Hbuw=; b=A5soup1rVRp2y9EdGxLb4Y+EtnN1BpbLIrGD761lFA7Sea3EBCgb7Q/Zj7gDqf+0Jf5r ymOUumlY0ySP+MaquQoiER8SB8oM2AtEOzf0kwlzO9DloPVuMKFQxHFvnQmOZfYgjS3D P92zRbi01p0xOlxagUjJh0OXPuGGL/3Zbf32YUHgOuBLGLggJ0ELbTly2RxngHB1dtzR N5xqlG1liHyXeB94e6jF42AxVsW25jGtmBa1ZJiBPB3BjvMKt+RQzPZJKGGw7P47t4UD NizfTBPrbDZ7vohFFwhE/2uRzwbkIUWRfhWUW2RaP9wqgZymQ/e7cP542FM5HTXKlpY3 mg== Received: from ma1-mtap-s02.corp.apple.com (ma1-mtap-s02.corp.apple.com [17.40.76.6]) by ma1-aaemail-dr-lapp02.apple.com with ESMTP id 2wf2axmv12-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 26 Nov 2019 16:25:10 -0800 Received: from nwk-mmpp-sz11.apple.com (nwk-mmpp-sz11.apple.com [17.128.115.155]) by ma1-mtap-s02.corp.apple.com (Oracle Communications Messaging Server 8.0.2.4.20190507 64bit (built May 7 2019)) with ESMTPS id <0Q1L00DVAQHVPX10@ma1-mtap-s02.corp.apple.com>; Tue, 26 Nov 2019 16:25:08 -0800 (PST) Received: from process_milters-daemon.nwk-mmpp-sz11.apple.com by nwk-mmpp-sz11.apple.com (Oracle Communications Messaging Server 8.0.2.4.20190507 64bit (built May 7 2019)) id <0Q1L00I00PKIHP00@nwk-mmpp-sz11.apple.com>; Tue, 26 Nov 2019 16:25:07 -0800 (PST) X-Va-A: X-Va-T-CD: e48e8dc3f6c377b8dc939b4126ad19f3 X-Va-E-CD: 7cad2ccc788d9956c21004e3d91943d5 X-Va-R-CD: 049e0c44e1213ecb97acf595ee715640 X-Va-CD: 0 X-Va-ID: 70515fe1-b1a9-440d-ad91-3a0e068ad48c X-V-A: X-V-T-CD: e48e8dc3f6c377b8dc939b4126ad19f3 X-V-E-CD: 7cad2ccc788d9956c21004e3d91943d5 X-V-R-CD: 049e0c44e1213ecb97acf595ee715640 X-V-CD: 0 X-V-ID: 353f1ac8-3612-4ee6-9583-f0990ea5f43d X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-11-26_08:,, signatures=0 Received: from [17.235.36.18] (unknown [17.235.36.18]) by nwk-mmpp-sz11.apple.com (Oracle Communications Messaging Server 8.0.2.4.20190507 64bit (built May 7 2019)) with ESMTPSA id <0Q1L00DEFQHTNP40@nwk-mmpp-sz11.apple.com>; Tue, 26 Nov 2019 16:25:07 -0800 (PST) Sender: afish@apple.com From: "Andrew Fish" MIME-version: 1.0 (Mac OS X Mail 13.0 \(3594.4.17\)) Subject: Re: [edk2-devel] [staging/master]:master on edk2-staging is out of date. Date: Tue, 26 Nov 2019 16:25:05 -0800 References: To: devel@edk2.groups.io, Mike Kinney In-reply-to: Message-id: <8019E4CE-A2D8-465B-BBAB-F2E9B26C2E20@apple.com> X-Mailer: Apple Mail (2.3594.4.17) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-11-26_08:,, signatures=0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: quoted-printable > On Nov 26, 2019, at 2:08 PM, Michael D Kinney wrote: >=20 > Hi Andrew, >=20 > The easiest way to create an edk2-staging branch based on the latest edk= 2/master is to clone edk2-staging and then add edk2 repo as a remote. Fetc= h edk2 and checkout edk2/master. Then create a local branch for Bz2387 bas= ed on edk2/master. When you want to share, push your local branch to edk2-= staging. >=20 > 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 >=20 > # > # Make local changes > # >=20 > # > # Push new branch to origin (https://github.com/tianocore/edk2-stagin= g.git) > # > git push origin Bz2387 >=20 > Mike >=20 > From: devel@edk2.groups.io On Behalf Of Andrew Fi= sh 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. >=20 > 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 tra= cks edk2/master, but I see it was last synced in June?=20 >=20 > 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?=20 >=20 > [1] https://github.com/tianocore/edk2-staging >=20 > [Step 1 is already completed, it is here for documentation purposes; pro= ceed to 2)] > 1) Create a new repo called edk2-staging > =09a) edk2-staging is a fork of edk2 > =09b) edk2-staging/master tracks edk2/master >=20 Mike, Thanks for the instructions that makes sense. The README on the edk2-stagi= ng about branch seemed to imply I needed to use the edk2-staging/master bra= nch? In retrospect that was probably more of me assuming the wrong thing? Thanks, Andrew Fish >=20 >=20 >=20