On Mon, Oct 30, 2006 at 12:46:22 -0400, Ralph Dratman wrote: > v v v v v v v > ************* > /*line-height: 200%;*/ > ^ ^ ^ ^ ^ ^ ^
Ok, my understanding is that you and Judy both had the same idea - you wanted to get rid of line-height: 200%; one of you did it by removing the line altogether, whereas the other did it by commenting the line out. In either case, it is a conflict. And that's ok! All you need to do now is to open the file in and text editor and get rid of those lines. Then do a darcs record, and call the patch something like "Fix conflict re: line-height". And if you ever mess up, no problem, because you can always do darcs revert and darcs resolve again to get back to the original conflict. > So really, my main focus is: what should I do next time this happens? The workflow basically consists of this - one of the developers does the conflict resolution (the bit with the text editor and the darcs record -- note that you can pinpoint where the conflict is by doing darcs new or by searching for "v v" in your editor) and creates a new patch. If Judy pulls from you at the same time as you pull from her, you might get into a situation where you both have the same conflict on your hands. One nice way to handle this is likely for one of you to do a darcs revert and wait for the other one to resolve the conflict. Alternately, you could create a central repository which you and Judy both push patches. This avoids some of the ambiguity in that you can never push a patch which causes a conflict. It then collapses into a CVS-style model of puller resolves the conflict on his end (and pushes the original conflicting patch and its resolution over). It depends on how much initial overhead you're willing to deal with. If pulling from each other and talking whenever there is a conflict works for you, then good. (Incidentally, it's how me and my supervisor write papers together) For more documentation, see the darcs wiki at http://wiki.darcs.net There is some discussion on best practices, as well as a hints and tips page which might be useful to you. Or don't hesitate to ask here or on the IRC channel #darcs (irc.freenode.net). Best, -- Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon français.
pgpGyG5k1mIIO.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
