Le 28/12/2011 23:52, Ru Vuott a écrit : > Hello, > > from Gambas-3 (svn checkout) updating I had a message: > > << ....... > ....... > U trunk/main/gbx/gbx_c_array.h > Conflict discovered in 'trunk/main/lib/db/gb.db/.startup'. > Select: (p) postpone, (df) diff-full, (e) edit, > (mc) mine-conflict, (tc) theirs-conflict, > (s) show all options:>> > > What have I to do ???? Which do I choose ? > > > Paolo >
'tc', to choose the file coming from sourceforge. You may have changed this file on your local repository by opening the gb.db project. Regards, -- Benoît Minisini ------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox _______________________________________________ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
