On 07/01/16 13:36, Ard Biesheuvel wrote: > On 29 June 2016 at 09:49, Wei, David <[email protected]> wrote: >> Reviewed-by: David Wei <[email protected]> >> >> 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 [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
