On Mon, Jul 25, 2011 at 3:24 PM, Aaron Meurer <[email protected]> wrote: > Hi everyone.
Can you describe what exactly you did with your branch? I.e.: 1) forked sympy in summer 2010, kept adding patches 2) merged with polys1 branch 3) polys12 (incompatible with polys1) merged to master 4) merged with master (thus *conflicting* with polys1, merged to your branch) I think, that maybe all (?) your troubles were caused by merging the polys1 with polys12, which were known to be incompatible, because polys12 was rebased. In other words, maybe this is just a manifestation of "never rebase, only merge", if people are using your branch. I think that as long as the only thing that you do is "merge", things should be much more easier. I have personally worked with some larger branches too (~250 commits easily), and my experience so far is that as long as there is no "double merge" (like polys1 and polys12), things are quite simple. My longest rebase was I think 1h of work. Ondrej -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
