Le 25/11/2011 11:50, wally a écrit : > 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 ? >
Normally you should type "tc" (theirs-conflict) to get the file from subversion instead of yours. It is not dramatic, as the ".startup" file is automatically generated by the compiler. So if you have any problem, you just have to recompile the gb.eval.highlight component. Regards, -- Benoît Minisini ------------------------------------------------------------------------------ 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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
