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

[Stefan Monnier]

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

I have many changes on my local branch which the maintainers haven't
accepted yet.  Of course, could install them anyway since I have write
access, but Stefan would bite my head off if I did.


        Stefan