Fixing rebase rather than avoiding it

[Óscar Fuentes]

"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> Eli Zaretskii writes:
>  > > From: Óscar Fuentes <ofv at wanadoo.es>
>  > > 
>  > > The first workflow that was recommended to the Emacs developers creates
>  > > a merge for every change, even for the most trivial ones.
>
> This is false; Bazaar recognizes fast forwards as well as any other
> VCS.  It only creates a merge for a change in the case where
> concurrent changes have actually happened in the project.[1]

`bzr merge' *always* requires a commit and thus ends creating a new
revision, unless you use the --pull switch.

Or I am misunderstanding something obvious?

[snip]