Hi Michael, On 2013-12-18, Michael Orlitzky <mich...@orlitzky.com> wrote: >> Didn't Volker say that merging is a bad idea? >> > > If there are no changes in 6.2 that affect your branch, you can get away > with a `git rebase 6.2` here.
Isn't rebasing even worse than an occasional merge commit? If I recall correctly, gits claim that rebasing a published branch means to change the history of the branch and is very evil. Best regards, Simon -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
