Personally, I prefer to use the second option for this kind of sync-up. Of cause, we need to have good senses about which updates will impact this staging feature.
Best Regards & Thanks, LONG, Qin > -----Original Message----- > From: Wu, Jiaxin > Sent: Thursday, May 19, 2016 11:35 AM > To: El-Haj-Mahmoud, Samer; Li, Ruth; Ye, Ting; Long, Qin; edk2- > de...@lists.01.org > Subject: RE: edk2-staging/HTTPS-TLS > > Hi all, > There are two ways to sync HTTPS-TLS branch with EDK2 master: > > 1. Sync all changes in EDK2 master to branch by rebasing the whole feature > branch. Need frequency request to sync edk2-staging/master to latest > edk2/master. This way can also keep branch code go straight with > edk2/master. > > 2. Only sync HTTPS/TLS related patches to branch (e.g. HttpDxe update). That > means to use one stable edk2 tag for edk2-staging/HTTPS-TLS branch > development. By this way, frequency request to sync edk2-staging/master > to latest edk2/master can be avoided but maybe some bugs fixed in > edk2/master can't be synced to branch timely. > > Both of them are not easy since it's probable that each updates in edk2 trunk > may cause the conflicts with the HTTPS code (HttpDxe driver and CryptyPkg > especially). > > Effort is almost. Which one do you prefer? > > Thanks. > Jiaxin > > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > > El- Haj-Mahmoud, Samer > > Sent: Thursday, May 19, 2016 6:10 AM > > To: Wu, Jiaxin <jiaxin...@intel.com>; edk2-devel@lists.01.org > > Subject: [edk2] edk2-staging/HTTPS-TLS > > > > Jiaxin, > > > > The HTTPs-TLS branch is behind EDK2 master, and they are quite a few > > conflicts to try to keep up with both. Can you please sync the branch > > from > > EDK2 master? > > > > Thanks, > > --Samer > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
