Hi,
I have a branch that i want to merge to the trunk so i did the
following:
cd trunk_working_directory
cvs update -j BRANCH
so, now i have the branch merged with the trunk in my working
directory.
when doing cvs status, i can see a lot of files with the status :
locally modified.
some of those files ware changed several times in the trunk after i
created the branch,
and now after doing the merge, those files changed and modified back to
the way they are in the branch(older state).
what am i doing wrong ?
I want only those files that ware changed on the branch to be merged and
not all files including files that are simply older versions that ware
not touched in the branch but did changed in the main trunk.
Thank you.
Moshe.
