Well, Jussi, thank you so much. vuotttt
--- Lun 26/11/12, Jussi Lahtinen <[email protected]> ha scritto: > Da: Jussi Lahtinen <[email protected]> > Oggetto: Re: [Gambas-user] Conflict in rev. #5378 > A: "mailing list for gambas users" <[email protected]> > Data: Lunedì 26 novembre 2012, 17:14 > I assume you are not contributing to > Gambas code, so just type tf. > (tf) theirs-full - accept their version of entire file > > Jussi > > > > On Mon, Nov 26, 2012 at 5:39 PM, Ru Vuott <[email protected]> > wrote: > > > 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 > > > > > > > ------------------------------------------------------------------------------ > > 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 > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/gambas-user > > > ------------------------------------------------------------------------------ > 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 > [email protected] > https://lists.sourceforge.net/lists/listinfo/gambas-user > ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/gambas-user
