Hello all, I've added some material on http://wiki.darcs.net/index.html/ConflictsFAQ on collisions and resolving them. Please feel free to review and comment on the page. -- Pekka.Pessi mail at nokia.com