Le 28/12/2011 23:52, Ru Vuott a écrit :
> Hello,
>
> from Gambas-3 (svn checkout) updating I had a message:
>
> << ...
> ...
> Utrunk/main/gbx/gbx_c_array.h
> Conflict discovered in 'trunk/main/lib/db/gb.db/.startup'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (
Hello,
from Gambas-3 (svn checkout) updating I had a message:
<< ...
...
Utrunk/main/gbx/gbx_c_array.h
Conflict discovered in 'trunk/main/lib/db/gb.db/.startup'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all
