[Gambas-user] Conflict in rev. #5378

[Jussi Lahtinen]

I wouldn't recommend usage of "tc" to non-developers, it doesn't accept
whole file and it can leave mess behind.
http://stackoverflow.com/questions/2121158/a-example-of-a-change-that-is-not-a-conflict

Also by using "tc" you may need to answer several times for same file.

Jussi






On Mon, Nov 26, 2012 at 7:08 PM, Benoît Minisini <
gambas at ...1...> wrote:

> 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
>