[Gambas-user] Conflict in rev. #5378

Ru Vuott vuott at ...325...
Mon Nov 26 16:34:39 CET 2012


Hello,

by updating my Gambas 3 with rev. 5378, I obtained this notice of conflict:


Rilevato conflitto in 'trunk/comp/src/gb.map/.info'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:


Well, in your opinion what's the best solution ?

Regards
vuott




More information about the User mailing list