On Wed, Jan 07, 2009 at 13:23:21 +0000, Eric Kow wrote: > First (of two) questions: what, in a nutshell, does it mean not to have any > conflicts? Clearly, there can be conflicting situations (i.e. two people edit > different parts of a file).
I meant here "e.g. two people edit *the same* part of a file :-) -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
