CVS branch merging ...

[MumboJumbo]

Hi folks,

I am using cvs branching for the first time ... and I have some 
questions ...

Here is the type of activity that we are performing:

1.) I created a branch called JOE
2.) I merded changes made to HEAD with JOE
3.) The merge results are then commited into JOE.

Here's the problems/questions we are getting:

1.) Any file that has been edited in JOE at any time will have merge 
conflicts regardless of the fact the file has not been edited since last 
commit to JOE. IS this correct or am i imagining this behaviour ...

2.) Is there a way to trigger a tool like source forges winmerge to run 
from wincvs ... instead of getting me file all messed up with diff info ...

3.) How can I responsibly merge branches in a way that is not going to 
cost me hours of work if i want to perform the bi-daily task of syncing 
to a branch like HEAD ...

Jim