Hi, I tried to do cvs merge today: cp -R ./soc-blender ./soc-head cd ./soc-head cvs update -jHEAD and my attempt of cvs merge ended with lot of conflicts in files, where I didn't do any change. Do I do anything wrong, is it normal or is cvs so stupid? I did cvs merge last week and it wasn't so painful. Best regards, Jiri