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...) _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
