[Lazarus] SVN update conflicts

Hans-Peter Diettrich DrDiettrich1 at aol.com
Tue Mar 20 11:37:49 CET 2012

Vincent Snijders schrieb:
> Op 20 maart 2012 03:17 heeft Hans-Peter Diettrich
> <DrDiettrich1 at aol.com> het volgende geschreven:
>> Updating to rev. 36173 results in a number of conflicts in various Makefile,
>> Makefile.compiled and Makefile.fpc, in components/ and packager/
>> subdirectories.
>> What's wrong?
>> How to fix that mess? (using TortoiseSVN)
> Revert.
> Update.

Thanks, that helped. Will I have to do the same in the future, before 
every update, or was it a glitch?

What's the reason for versioning e.g. Makefile.compiled?


More information about the Lazarus mailing list