On Tuesday, December 17, 2013 4:20:53 PM UTC, Jeroen Demeyer wrote: > > 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. > > Jeroen. >
-- 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.
