On Fri, Jul 16, 2010 at 10:05 PM, Ondrej Certik <ond...@certik.cz> wrote: > On Fri, Jul 16, 2010 at 5:57 PM, Brian Granger <elliso...@gmail.com> wrote: >> On Fri, Jul 16, 2010 at 2:57 PM, Aaron S. Meurer <asmeu...@gmail.com> wrote: >>> They should get good at the git rebase command. The —onto flag can also >>> help, such as if they want to rebase only part of a branch (the equivalent >>> of cherry-picking a group of commits). This is what I have been doing with >>> my branch and Mateusz's polys branches. Also, as Mateusz has done with >>> polys, I have found it helpful to create a new branch every time you rebase. >> >> I understand the attraction of rebase, but isn't one of the huge >> advantages of git is that it does merges so well? For work that needs >> to be public, merges seem perfect because you don't have to keep >> creating branch after branch. > > > If it's public, then I usually just do merges, but it's true that the > history gets a bit complex, so I do rebases as much as I can, but if > more people start using my public branch, I just do merges from the > point on, because rebases screw things up for everybody. Merges are > better, because they go from one known state to another and you just > keep adding features.
OK that makes sense. For the work that Addison, Matt and I are doing I think merges will work best for now. Thanks! Brian > > Ondrej > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To post to this group, send email to sy...@googlegroups.com. > To unsubscribe from this group, send email to > sympy+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/sympy?hl=en. > > -- Brian E. Granger, Ph.D. Assistant Professor of Physics Cal Poly State University, San Luis Obispo bgran...@calpoly.edu elliso...@gmail.com -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sy...@googlegroups.com. To unsubscribe from this group, send email to sympy+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
