[Gambas-user] Conflict in rev. #5378

[Ru Vuott]

Thank you, Benoît.

bye
vuott





--- Lun 26/11/12, Benoît Minisini <gambas at ...1...> ha scritto:

> Da: Benoît Minisini <gambas at ...1...>
> Oggetto: Re: [Gambas-user] Conflict in rev. #5378
> A: "mailing list for gambas users" <gambas-user at lists.sourceforge.net>
> Data: Lunedì 26 novembre 2012, 18:08
> 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
> 
> ------------------------------------------------------------------------------
> Monitor your physical, virtual and cloud infrastructure from
> a single
> web console. Get in-depth insight into apps, servers,
> databases, vmware,
> SAP, cloud infrastructure, etc. Download 30-day Free Trial.
> Pricing starts from $795 for 25 servers or applications!
> http://p.sf.net/sfu/zoho_dev2dev_nov
> _______________________________________________
> Gambas-user mailing list
> Gambas-user at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gambas-user
>