ubuntu-manual team mailing list archive

bzr conflict

To: Liste Ubuntu-Manual <ubuntu-manual@xxxxxxxxxxxxxxxxxxx>
From: Sylvie Gallet <sylvie.gallet@xxxxxxx>
Date: Thu, 31 Mar 2016 18:42:10 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0

Hi All,

I'm running into a conflict problem with two of the screenshots, eachone is now in my local copy as 3 different files .BASE, .OTHER and .THIS.

Can someone explain to me how to solve the problem, in both cases, the.THIS version is the one I wanted to commit.


Thanks in advance,

Sylvie