Hi Ales and all, I've localy tried a merge: cvs update -j autonumber-base -j HEAD -dP (without the intermediate merge tag suggested by Dan)
There are only a few conflicts to solve. One is the ChangeLog file. What shall I do with the ChangeLog entries from the branch when merging back to the trunk? I'll do a second test merge tomorrow and then I'd like to merge the autonumber branch back to the trunk. Regards Werner _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
