darcs conflicts faq

Pekka Pessi and I have put together an FAQ on the darcs conflict problem. It has three major sections:

1. Everyday conflicts: what conflicts are and how you should deal with them in the general case.
   
2. The big conflicts bug: what it is, how you can avoid it, and what to do if you have run into trouble.
3. Darcs 2.0: from a user perspective, how it will change from darcs 1.x (not very much), and what resolving conflicts might look like (rollback will play a bigger role). David has been making some great progress. Nevertheless, our best estimates are that we will be ready for alpha testing only in Feb 2008, and release by the second quarter of that year.

There may be some mistakes or gaps in the FAQ, but I hope that you will find it useful.