Re: Help me unstick my bzr, please.

[Stephen J. Turnbull]

Eli Zaretskii writes:

 > Why not simply
 > 
 >   ~/emacs/emacs.bzr/quickfixes$ bzr merge --force

Because Alan's commit will be a merge commit, not a regular commit.
This probably won't confuse most humans, who will be looking at Alan's
commit message, not at the parentage of the commit, but it might cause
issues with DAG tracing tools like bisect.

It will also very likely cause Alan's commit to appear to be the
mainline, and all of the commits he has merged to be a feature branch,
in the logs and GUI DAG viewers.  This would be disconcerting to
experienced bzr users.