> Yeah, this is where the merging instead of rebasing thing strategy > comes in handy. You just do all your changes in branches, and merge > them together when you need them. Since the merge doesn't affect the > original commit, this won't create duplicate commits, and will extend > naturally when the commit is merged into master. >
When you have the time could you explain (or point to an explanation) about the merge vs rebase strategy. It is not clear to me how this works. -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sympy@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.