> So in plain English, one line was added to the branch > as a bug fix, now I just want to add this line to the > file on the main trunnk. > > Why can't CVS just add this line, I don't understand > why I get conflicts?
I assume source.txt is a small test file? Use a real program source instead - diff's don't work so well on short files and conflicts become unavoidable. Pick a source file with 100 lines and test with that. If you don't like having to specify the two revisions all the time CVSNT (GPL, unix/linux etc) allows you to merge using bug ids, ie: on branch b1 "cvs commit -B 1234" then on trunk: "cvs update -j b1 -B 1224" (ie: cvsnt supports user defined change sets). Note: if you do decide to use cvsnt, please subscribe to the cvsnt newsgroup. Regards, Arthur
