[darcs-users] Conflicts over SSH

Lst Recv listrecv at gmail.com
Sun Nov 20 03:51:01 UTC 2005


Is there anyway to push patches with conflicts over SSH, or do I need
to generate a file using send, copy it manually, and apply with
--merge-conflicts?

Also, how does darcs handle conflicts in binary files (it can't
exactly put markers in them).  (I would think that the best option
would be to prompt the user, and to show him the mod times of each
one...)




More information about the darcs-users mailing list