[Lazarus] SVN update conflicts

[Hans-Peter Diettrich]

Mattias Gaertner schrieb:

>> Thanks, that helped. Will I have to do the same in the future, before 
>> every update, or was it a glitch?
> 
> Something changed your makefiles. I don't know what.

Hmm, very obscure.


>> What's the reason for versioning e.g. Makefile.compiled?
> 
> The Makefile.compiled is used by "make" to create the
> pkgname.compiled files. This way the IDE knows how a package was
> compiled and knows if it needs to recompile the package.

Since everything must be compiled on the *local* machine, it doesn't 
make sense to import (from the repo) an Makefile.compiled from a 
*different* machine. Like it doesn't make sense to import the compiled 
(binary) files, that match the imported Makefile.compiled.

I'm not sure about Makefile.fpc, which also is auto-created.

DoDi