Rebasing is definitely worse. *Useless* commits can be annoying, but at least they don't invalidate other people's work.
If you have a reason to merge (conflict resolution or you need feature from other branch), then merges are the right thing to do. On Wednesday, December 18, 2013 10:01:41 PM UTC, Simon King wrote: > > 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. > > -- 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.
