On Mon, Jan 25, 2016 at 2:47 PM, Shai Erera <[email protected]> wrote: > The 'merged' commit, in this case, seems redundant to me as it doesn't add > any useful information about them. I believe this case isn't an example one > for a merge. Just my thoughts...
+1 For back-porting the majority of issues from trunk to 5x, cherry-pick should definitely be the default we point to. "merge" is about merging *all* changes from a branch, so it won't even work unless one has a separate feature branch for the change being back-ported. -Yonik --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
