[Lazarus] SVN update conflicts

[Hans-Peter Diettrich]

Mattias Gaertner schrieb:

>>>> 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.
> 
> What exactly makes no sense?

The Makefile.compiled must match the last compilation on the user 
machine. It doesn't make sense to use one from a compilation on a 
different machine. Following your explanations, currently "make" is 
fooled whenever a Makefile.compiled is overwritten ("updated") by a 
version from the repository.

DoDi