On Sun, Jun 17, 2012 at 12:31 AM, Aaron Meurer <[email protected]> wrote: > The best thing about merging is this: I don't even have to try to > understand your history there. It doesn't matter what it is; if you > always merge, you will *never* end up with duplicate commits. > > You also don't even really have to think about commit graphs. If you > have a branch A and and you want it to contain content from branch B, > then merge B into A.
Yes, that sounds very cool, especially when there is more than one branch besides master and they are complex. Also, merging takes less time, I guess. I spend about 10% or my working time on rebasing stuff and keeping my commit history in some sort of order. This has the advantage that I may afford extending and correcting certain commits no matter where the in the branch they are, but this also requires time and effort, for some obscure puritan reason. It's not the first time when I think that I may eventually try a merge in my topic branch :-) Sergiu -- 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.
