Re: bzr commit raises a weird conflict

[Eli Zaretskii]

> From: Christopher Schmidt <address@hidden>
> Date: Tue,  9 Apr 2013 09:42:39 +0100 (BST)
> 
> Bastien <address@hidden> writes:
> > How can I resolve this "conflict"?
> >
> > I know it safer to build from a dedicated branch, and to use a clean
> > branch for commits, but still, I don't understand what's wrong.
> 
> I don't understand what's wrong, either.

The directory is removed in the master repository, but not in the
local branch.  That's a conflict that prevents a clean merge.

>     bzr resolve --take-other
> 
> solved it for me.  This is probably another bug in bzr.

It's not a bug, and the above is precisely the way to resolve such
conflicts (of course, you could also use --take-mine, but in this case
that would be wrong).

Bastien, next time you have such non-text conflicts, type

  bzr help conflict-types

and read there (it's a long entry, so redirect to a pager or to an
Emacs buffer).  In particular, this specific conflict is described
under "Deleting parent".