Fixing rebase rather than avoiding it

[Eli Zaretskii]

> From: Óscar Fuentes <ofv at wanadoo.es>
> Date: Thu, 04 Mar 2010 05:17:47 +0100
> 
> The first workflow that was recommended to the Emacs developers creates
> a merge for every change, even for the most trivial ones. Fortunately,
> most people migrated to saner practices. Those who still are using the
> initial workflow (because they learned it at the beginning and didn't
> cared about looking at other options) are polluting the history with
> unnecesary merges that just contribute to make bazaar slower on the
> Emacs repo.

IMO, advising those who didn't to switch to ``saner practices'' is a
better path than telling them to use "bzr rebase".  The result will be
the same, but with much less potential for confusion and errors.