On 2016-04-01 21:31, Emmanuel Charpentier wrote: > * revert to by original patch against 7.1rc0, update it and push this > to Trac for review ? Or > * push by jumbo patch ?
If the merge of 7.2.beta2 into your 7.1.rc0+whatever works without a conflict, then there is no need to do this merge. If there is a conflict, then you should merge 7.2.beta2 into your 7.1.rc0+whatever. (Just to point this out: you should merge it in the way said and not the other way round) But, I have to admit, maybe I do not understand your problem completely (because merging in 7.2.beta2 if not needed is possible as well; I do not see why you call it jumbo patch). Daniel -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sage-support. For more options, visit https://groups.google.com/d/optout.
