[Lazarus] Problem using the SVN program: source files "mutilated"
Hans-Peter Diettrich
DrDiettrich1 at aol.com
Fri Feb 20 23:56:09 CET 2009
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
More information about the Lazarus
mailing list