[Gambas-user] svn update conflict problem

[Jussi Lahtinen]

If you don't want to save any modification you have done to Gambas source
code,
then easiest option is tf. Otherwise you may have to answer several more
questions.

(tf) theirs-full - accept their version of entire file

Jussi




On Fri, Nov 25, 2011 at 12:50, wally <wally at ...2037...> wrote:

> svn update
> Conflict discovered in 'comp/src/gb.eval.highlight/.startup'.
> Select: (p) postpone, (df) diff-full, (e) edit,
>        (mc) mine-conflict, (tc) theirs-conflict,
>        (s) show all options:
>
> what to do ?
>
>
> ------------------------------------------------------------------------------
> All the data continuously generated in your IT infrastructure
> contains a definitive record of customers, application performance,
> security threats, fraudulent activity, and more. Splunk takes this
> data and makes sense of it. IT sense. And common sense.
> http://p.sf.net/sfu/splunk-novd2d
> _______________________________________________
> Gambas-user mailing list
> Gambas-user at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gambas-user
>