Re: Help me unstick my bzr, please.

[Eli Zaretskii]

> From: Giorgos Keramidas <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Sat, 16 Jan 2010 11:02:04 +0200
> 
> > Why not simply
> >
> >   ~/emacs/emacs.bzr/quickfixes$ bzr merge --force
> 
> To be honest, because I don't know for sure what merge --force does
> under the hood.
> 
> It sounds like it will solve the immediate problem of having a
> quickfixes branch half-way through a merge, but it also seems it will
> create a merge commit that includes both the pending merge changes *and*
> the small fix in the same changes.

Except for "bzr bisect", who else will be bothered by this?