Re: Bzr document unclear. There is no "conflict markers".

[Richard Stallman]

    The quick answer is that the "quickfixes" branch could have diverged
    from the trunk, for example because some of the developers changes have
    not been accepted (yet) into the trunk.

The concept of "accepted into the trunk" puzzles me.  If someone has
write access, he can install his changes into the trunk, right?  So if
he has committed all his past changes, there's nothing to merge --
right?

Are you assuming the case of a person who doesn't have write access
on Savannah?