On Sat, 1 Oct 2011 09:55:57 +0100 Frank Church <vfcli...@gmail.com> wrote:
>[...] > Are .res compatible on a cross platform basis? Do they belong in VCS? Well, on the first hand the .res files created by the IDE are auto created, so theoretically you don't need store them in VCS. On the other hand the res file in the a source directory, which might be readonly, then the res should be in VCS. I'm not sure if the format is totally platform independent. > Are .lpi files compatible across platforms? Yes. But of course you can put platform dependent values in it, which will fail to be converted. For example a path C:\test can not be converted to Linux. > I tried to merge a windows .lpi > file into a Linux one and got a merge conflict. A merge conflict means that both files were altered at the same place in different ways. Or that you use incompatible diff/patch tools. > Are such conflicts usually resolvable? Yes. Mattias -- _______________________________________________ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
