Yoooooooooooooo !! > Interesting point. Is that something that should be actively avoided? > > Let me explain why I ask this: I am currently working (with Peter Bruin) on > various tickets related to PARI. At some point I merged one branch into > another. I could have developed this branch independently, but I was afraid > there could be conflicts because both branches touch the same file. It turns > out there were no conflicts, but that's hard to tell without doing the > merge.
I think Volker just had merging with a more recent Sage release in mind. In many cases you are forced to merge unreviewed branches into the one you are developping. Because you may need many tickets to implement a big feature, or just because you notice bugs by writing new code, and that you cannot use the new code without fixing the bugs at the same time (in another ticket). Nathann -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
