Tried collaborative development, set up server.
After correctly setup of router, it started to work and synced the assets.
However when we tried start sync our source codes with Syncronise Codes menu, it added the new entirely source items correctly but merge seems just appended the local + server code to one source instead of merge. Top source part is the remote, bottom source part is local/mine.
It seems merge considered two totally different sources, though the real difference is about 2-3 lines. What can be the problem, maybe different end of lines, text coding, etc?

thanks,
Gabor

+1 on this issue;

I reported this as well last week, though Esenthel's response was to use SVN for better handling of conflicts.

My trust in the code synching is 0.

+1 on this issue too..

What i am doing just to make sure that i don t lose anything is that i use svn where i do backups every time i finish up with something and also i creat a new project just for scripts where i copy everything before i sync this way i don t lose anything for sure..