Hi,
I have a very big problem with cvs and merging.
I have two branches : project_1 and project_2.
I was trying to merge project_1 into project_2 by doing :
cd project_2 (this is my project_2 working directory)
cvs update -j project_1
now, i noticed that the merge DELETED some code lines that where in a
file in project_2 doring the merge.
those lines whernt on the same file in the project_1 branch.
why is that ?
why didnt CVS just marked the difference between this two files ? (like
diff does)
can cvs be "trusted" in preforming marges ? am i doing something wrong ?
Thanks.
