-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Thursday 30 June 2005 00:33, Panu A. Kalliokoski wrote: > I notice the support for add conflicts is not so great. I'd like it > more if 'darcs resolve' dropped e.g. the contents of both files, with > conflict markers all around, into the file. That way, I wouldn't need > to dig the contents of the file from somewhere else. (Is there some > easy way to extract a former version of a file in darcs, by the way?) > > But there are some more theoretical implications I don't understand. > First of all, I cannot seem to come up with a way to resolve the > conflict by renaming. The history of one or the other must be broken. > Why is this so? One would think that the neatest way of resolving an > add conflict would be to rename one of the files. [...]
Honestly, I can't follow what the heck your problem is. Could you explain instead of complain about the problem you have? Cheers! - -- Thomas Zander -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQFCxV6LCojCW6H2z/QRAt4WAKD0hWqEproWvyBWLiV3hka9pJir0gCfeciY +38i3qHaKvsae1AWlyMoJAs= =Dv2v -----END PGP SIGNATURE----- _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
