Am Sonntag, den 13.07.2014, 17:08 +0100 schrieb Ru Vuott: > Hello, > > updating with last svn revision: #6373, I obtain this: > > Conflict discovered in file 'trunk/comp/src/gb.report/.info'. > Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, > (mc) my side of conflict, (tc) their side of conflict, > (s) show all options: > > > Ehmmm.... what do you suggest ? > > Thanks > vuott
you made changes to the gb.report. (mc) mine-conflict - accept my version for all conflicts (same) (tc) theirs-conflict - accept their version for all conflicts (same) so enter tc -- Amicalement Charlie ------------------------------------------------------------------------------ _______________________________________________ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user
