[Gambas-user] Conflict in rev. #5378

[Benoît Minisini]

Le 26/11/2012 16:34, Ru Vuott a écrit :
> 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
>

In that case, 'tc' -> Use the file from the repository.

-- 
Benoît Minisini