Merging from branch to main line

[McCann, Brian]

Hi,

I'm using WinCvs ver 1.2 here's my question which involves merging changes
to a file on
a branch back to the main line. This is all based on a test repository.
Using the WinCvs GUI.
The test repository is test_cvs and the branch is test_cvs-BRANCH. I have a
text file test.txt
and I make changes to the file and if I want to merge the change back to the
mainline I go into
the mainline repository click on test.txt the from the main menu click
modify the update selection
then click the tab merge options and select the radio button Only this
rev/tag then type in the name of the branch.
This will merge the branch test.txt with the mainline test.txt file. Now
comes the problem if I continue to make
changes to test.txt on the branch and then try to merge the change with the
GUI following the same procedure above
I get a conflict warning. Is there a way to merge additional changes with
the GUI without getting the conflict?

main line test_cvc,  file test.txt rev 1.11
modify main line test.txt file, file rev 1.12
branch test_cvs-BRANCH2, file test.txt rev 1.11
modify test.txt on branch  rev becomes rev 1.11.2.1
merge branch to main line no conflicts
modify branch file text.txt rev 1.11.2.1 becomes 1.11.2.2
merge to main line this is where the conflict appears.


Thanks,
Brian