Hi all > > Well, the 'proper' way would be to set up a CVS repository; you and your > friend both check out a copy, make all your changes, then try to check > the changfes back in. CVS would alutomatically try and merge back both > sets of changes, and warn you where the changes overlap. As per usual doing things the improper way to save time tends to lead to lots of time-wasting :) > > But since you havent' much time, you may want to ruin merge(1) on each > file individually, which is sort of like doing a CVS checkin manaully > for each file. merge did the trick, with a little bit of tinkering on lines that we'd both changed. Cheers for the replies Tom
Attachment:
pgp00008.pgp
Description: PGP signature