> > 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 ? >
The problem comes if you rebase a branch on which somebody else had based a commit (so started a parallel branch that he meant to merge later). As an example, you open a ticket and somebody else has a dependency on your ticket and start his new ticket out of it (without you knowing). Then when you rebase, this other person is based on a "ghost" branch that is complicated to handle... Cheers Viviane > -- > 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. > -- 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.
