Re: 'svn update' command, in case of conflict, should leave the version with unchanged conflicting parts

[Yuri]

I would make a correction here: conflicting parts could be marked up in 
a different fashion:
<<<<<<< begin conflict
<... section of mine with conflicting changes...>
>>>>>>> end conflict
Otherwise it is difficult to tell where the conflict is. Maybe you can 
name the file <file name>.conflicts

Yuri