On Friday, December 5, 2014 11:16:34 AM UTC, Simon King wrote: > > Moreover, there are merge conflicts. Hence, they *have* to be > resolved at some point. >
Yes, but they only need to be resolved once if you wait. Eventually there will be a conflict with the develop branch that you need to resolve. But if all merges are with the develop branch then all future merges see the resolution in their history, so you don't have to re-do them. -- 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.
