Sorry, for this... I'm trying to get a current cvs snapshop from the 2.2 branch and tried this: cvs -z5 -d :pserver:cvs at pserver.samba.org:/cvsroot co -jSAMBA_2_2 samba But there are these <<<<<<< configure ... ======= .. >>>>>>> 1.125.4.4 everywhere in the files. What am I doing wrong? -- Torsten