Folks- Frequently, I work on a branch and then merge as follows (assume my project is called testProj, and my branch is called Old_branch)
- cvs co testProj - cvs update -j Root_Of_Old_branch -j Old_branch - Work on resolving conflicts - Check in For the most part, conflicts have occurred as expected, however, occasionally I notice that conflicts are generated for certain files even though there have been *no* changes between the root of the branch (Root_Of_Old_branch) and the tip of the main trunk (testProj). Any thoughts why? Any summaries of the algorithm used by CVS to generate conflicts? thanks, -Johnny. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
