> > However, rebasing changes *on* master, before they are pushed, is a good > thing, because that kills non-fast-forward merges. >
Nontrivial rebases *on* master can be problematic because you're changing history. Imagine you pull some nice commits from a user. Then at some point you will have to rebase them before you push them. If this fails and requires manual interaction, the original version of the commits is lost (including signatures) and errors are not traceable. With a merge instead any manual intervention is clearly located in the merge commit and the authors of each change are uniquely identifiable. -- Andreas K. Huettel Gentoo Linux developer (council, kde) dilfri...@gentoo.org http://www.akhuettel.de/
