Hello ! > Thats terrible advice. Rebasing always makes it harder to keep multiple > branches conflict-free. The only advantage of rebasing are > easier-to-understand logs.
It does make easier-to-understand logs. I also believe (but Simon would have to check) that it would avoid his double-conflict-solving problem. 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. Nathann 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. As if it had been solved from the start ! How can that make things more complicated later ? -- 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.
