Ard: There is no rule change. This is the wrong operation.
Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Laszlo Ersek > Sent: Friday, July 01, 2016 8:27 PM > To: Ard Biesheuvel <ard.biesheu...@linaro.org>; Wei, David > <david....@intel.com>; Justen, Jordan L <jordan.l.jus...@intel.com> > Cc: He, Tim <tim...@intel.com>; edk2-devel-01 <edk2-de...@ml01.01.org> > Subject: Re: [edk2] [PATCH 6/6] Vlv2TbltDevicePkg: fix ASSERT_EFI_ERROR() > typos > > On 07/01/16 13:36, Ard Biesheuvel wrote: > > On 29 June 2016 at 09:49, Wei, David <david....@intel.com> wrote: > >> Reviewed-by: David Wei <david....@intel.com> > >> > >> Thanks, > >> David Wei > >> > > > > Hi David, > > > > It seems like Laszlo and you both pushed this patch, and you merged it > > rather than rebasing first. > > > > This means we now have two copies of the same patch, which needlessly > > obfuscates the GIT history. > > Question to the crowd: what is the latest policy regarding merges vs > > linear history? It was discussed at great length but IIRC the standing > > policy is still 'no merges' ? > > The rule I've been tacitly following is: rebase unless a contributor > specifically requests a PULL. (On the list, not on github.) > > Thanks > Laszlo > _______________________________________________ > 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
