CVS with Eclipse Branch/Merge question

[fsa3]

Hi all,

I'm building a web application with Eclipse and want to utilize the CVS

branching to support coding new larger scale functionality while also
being able to make and deploy minor changes.  My experience with CVS is

limited but from my reading it seems like branching and merging is what

I want.


What I've done so far is Tagged the code and then branched it (new
branch is V1_1).  I've been playing around and can't seem to figure out

what the proper way to make changes is and then merge them.


If someone could give some tips on how I should:


a) Make a change to the "base" code and deploy it.
b) Code changes for new functionality and then merge them with minor
changes?
c) Should/can branching/merging done on per file basis or per module?


Thanks, 
Frank