Hi A course-mate and I have been writing Java code for an assignment we're doing. We've been working separately on the same files and now it's time to get the two sets of files synchronised. I've just tried using rsync, but it doesn't work as I though it did. So after doing `rsync * code/` I was left with code/ being the same as ./, i.e. the transfer occurs only in one direction, is there a way for having it work in both directions at the same time, so I'm left with code which is a mixture of both sets of code. I'm assuming this is possible (most things are with Linux :-) and I don't have to a a diff and then cut+paste by hand. The assignment's due in tomorrow (Thursday) so a speedy response is appreciated. TIA Tom
Attachment:
pgp00006.pgp
Description: PGP signature