Le 30/10/2014 23:20, Tobias Boege a écrit : > On Thu, 30 Oct 2014, Ru Vuott wrote: >> Hello, >> >> updating Gambas with rev. #6593, I have this message: >> >> >> Conflict discovered in file 'trunk/comp/src/gb.eval.highlight/.startup'. >> 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: s >> >> >> What choose do you suggest ? >> > > I'm not a svn expert but if you didn't change the file, you should be fine > with "tc". > > In any case, it shouldn't matter because .startup is a generated file, > created by the compiler. It carries no new information and you can just go > and regenerate it. This begs the question why it is versioned in the first > place... > > Regards, > Tobi >
It's a bug, that file should not be in the repository. I will fix that... -- Benoît Minisini ------------------------------------------------------------------------------ _______________________________________________ Gambas-user mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/gambas-user
