Chances are you're using the default common ancestor for each merge. The 3-way merge algorithm then rediscovers each change made cumulatively on both branches each time. The solution is to specify the result of the last merge as the common ancestor when you run "cvs update". For that, you must tag the results of each merge and remember to use that tag for the next merge.
It's a pain, but if you reuse the tag then the procedure can be automated. --- Forwarded mail from [EMAIL PROTECTED] We now have developers working in multiple branches. When ready I merged their branches into a release branch. When merging I'm finding myself fixing the same conflicts over and over. I have a feeling I'm missing something simple in our process. Any enlightenment? --- End of forwarded message from [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
