yade-users team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

For this case I always have cleanBzr folder
You can just remove those conflict files by "clean" ones. Then bzr resolve
and it should work.
______________________________

Anton Gladkyy


2010/5/5 Jerome Duriez <jerome.duriez@xxxxxxxxxxxxxxx>

>
> Jerome Duriez a écrit :
>
>  Just download again the latest bzr version and compile again.
>>>
>> Could you please just precise what you mean here by "download again the
>> latest bzr version" ? Because a new bzr up just tells me that my tree is up
>> to date.
>>
>
> I can add to this last sentence :
> Thus the conflicts still exist and compilation is impossible because of
> what was written in corresponding files : the  <<<<<<<<<<TREE...... and so
> on lines
>
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-users<https://launchpad.net/%7Eyade-users>
> Post to     : yade-users@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-users<https://launchpad.net/%7Eyade-users>
> More help   : https://help.launchpad.net/ListHelp
>