Fixing rebase rather than avoiding it

[Óscar Fuentes]

Eli Zaretskii <eliz at gnu.org> writes:

>> 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.

rebase is safer than working on a bound branch and faster than
merging. When it is appropiate, of course.