I only ever rebase, and the only thing I have to watch out for is to not extend acbk into master's commits, e.g. `git rebase -i head~5` to work with the last 5 commits *of mine*. If the 6th one is a merge that is part of master then that can be really nasty (it shows up as there being more than 6 commits that you are working with in the editor -- that's how I know if I made a counting error).
-- 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.
