On 14 February 2011 19:35, Daniel Leidert <daniel.leidert.s...@gmx.net> wrote: > Am Montag, den 14.02.2011, 15:41 +0000 schrieb Noel O'Boyle: > >> Llast year I lost some hours and some data due to merge problems and I >> can already see this happening again (my r4375 has been blocked due to >> confusion). > > I'm sorry for that. In doubt just solve the conflict by using your > version (IMO 'mine-full'). I can restore the changes I made.
Your merge is fine, Daniel - don't worry about that. The problem is simply tracking the merges... Thanks for understanding, although note that Geoff may yet overrule this suggestion... - Noel ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ OpenBabel-Devel mailing list OpenBabel-Devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbabel-devel
