Remember, when merging branches like this CVS has to work its way
(through the diffs) back to the branch point, and then up the new
branch. Even though the files look the same, CVS keeps no information
stating that the versions can be directly diff'd. You will often get
these pseudo-conflicts as a result of this process. Sometimes I find it
simpler to do the branch merges myself (external program).
-- David F.
Chris Sherman wrote:
>
> Isn't that just completely weird??? What went wrong? Lines 4-8
> (in the last section) aren't even marked in the conflict, even
> though they went away. And since there were never any commits
> to this file in Branch 1, where did the conflict come from in the
> first place??? I'm so confused...
>
>
> --
> Chris Sherman
> [EMAIL PROTECTED]
> JAPH / UNIX RE / STO
>
> _______________________________________________
> Info-cvs mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/info-cvs
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
