Larry Jones wrote:
> Moshe Levy writes:
> >
> > 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 ?
>
> Most likely those lines existed in the original version of the file in
> teh project_1 branch and were explicitly deleted somewhere along the
> way. When you merge, you merge deletions and well as additions and
> changes.
>
> -Larry Jones
>
> I don't think math is a science, I think it's a religion. -- Calvin
So, how do i avoid the automated deletions in the merge ? i think the cvs
should atleast warn or do a diff on that kind of a change.
