CVS Branch / HEAD problems

After checking out files from a branch, then trying to merge those changes into the head causes greif and major frustration.

Apparently, you must check these files out from a file structure above the file in question, then you must do the same for the head to get the file to merge in.

This is crap!