[Gambas-user] Conflict discovered in 'trunk/main/lib/db/gb.db/.startup'.

[Ru Vuott]

Hello,

from Gambas-3 (svn checkout) updating I had a message:

<< .......
   .......
 U    trunk/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 options: >>

What have I to do ???? Which do I choose ?


Paolo