Best-Practice "Merge vs. Rebase" searched...

[Dirkjan Ochtman]

On Tue, Oct 20, 2009 at 15:04, Alexander Schatten
<ml_alexanderschatten at gmx.at> wrote:
> I had no real good arguments, but my feeling is, that this is not the best idea. I then searched a little bit in the Mercurial docs, in the "Definitive guide" and found actually nothing on that topic. I found some blog-posts like this one:

Try looking at this: http://lwn.net/Articles/328436/ (Linus is
abrasive as usual, but has good points here).

Summarizing: don't rebase things you have already published in a
public/dev-facing repository, but feel free (in fact, encourage)
rebasing local changesets to promote linear history.

Cheers,

Dirkjan