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. Aaron Meurer On Jun 16, 2012, at 3:24 PM, "[email protected]" <[email protected]> wrote: > I think that this is a good example: > https://gist.github.com/2942535 > > -- > 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. > -- 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.
