To reintegrate after disconnected operation, start venus as usual, and get a Coda token, since without a token, you won't be allowed to write changes to the file server. Give the command
cfs fr /coda/myfiles/mountpoint
(which means, Coda file system, force reintegration on this volume) specifying the mount point of each volume you wish to reintegrate. (This is a minor nuisance if you forget that you have changed some other volume.) If conflicts are reported, you need to resolve them as soon as you can.
Conflicts are handled by a process called `repairing', and there are several commands that help you do this. When you begin a repair, the volume is locked, and the inconsistent files are `spread out' as distinct objects in the file system. You can then edit the files and harmonise them before ending the repair and reintegrating the file system again.