On Sunday, December 21, 2014 11:41:42 AM UTC+1, Nathann Cohen wrote: > > Really, I did work with 4+ tickets in linear order. If you add a > commit to the first one that's 1+2+3+4=10 merge commits that appears > on Sage's tickets. Now do that twice, and look at your branches. >
Do not do it, then. Not every commit to the first ticket needs to be propagated to every other branch. P.S.: I do not understand why you say that rebasing branches would > make it *harder* to keep branches conflict-free. Once the rebase is > done you don't even have a *trace* that there was once a conflict Except that the conflict now went from minor annoyance to giant pain in the rear in every branch that you did not rebase (because you forgot, or because somebody else made said branch). -- You received this message because you are subscribed to the Google Groups "sage-devel" 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 http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
