Bart schrieb: > So I should now do > svn revert > > this will undo all changes I made. > and after that > > svn update > and I get my own patch back in the proper way?
Or you fix the marked conflicts in the source code. This is what the markers are good for - prevent compilation of code, where SVN merge couldn't find a unique solution. On Windows you can use TortoiseSVN, with many GUI and explorer extensions, to locate, compare and fix conflicts. DoDi _______________________________________________ Lazarus mailing list Lazarus@lazarus.freepascal.org http://www.lazarus.freepascal.org/mailman/listinfo/lazarus
