[tahoe-dev] darcs conflicts FAQ

[zooko]

The darcs developers have put up a useful FAQ about dealing with  
conflicts:

http://wiki.darcs.net/index.html/ConflictsFAQ

Fortunately, our current development process doesn't generate the  
nasty kind of conflicts (the ones that make darcs lock up), but this  
FAQ gives a good overview of how to deal with "everyday" conflicts  
and how to avoid nasty ones.

It also includes information about the planned darcs v2.0 which fixes  
the "locking up" part.

Regards,

Zooko