[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bzr commit raises a weird conflict
|
From: |
Christopher Schmidt |
|
Subject: |
Re: bzr commit raises a weird conflict |
|
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.
bzr resolve --take-other
solved it for me. This is probably another bug in bzr.
Christopher
Re: bzr commit raises a weird conflict, Giorgos Keramidas, 2013/04/09