[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: |
Wed, 10 Apr 2013 08:38:19 +0100 (BST) |
Eli Zaretskii <address@hidden> writes:
>> From: Christopher Schmidt <address@hidden>
>> bzr resolve --take-other
>> solved it for me. This is probably another bug in bzr.
Hi Eli,
thank you very much for your explanation. I should have investigated
before calling in another bug. I will be more careful next time.
My apologies for the noise.
Greetings,
Christopher
Re: bzr commit raises a weird conflict, Giorgos Keramidas, 2013/04/09