Hello, After reading the darcs manual, I do not understand how to merge conflicts manully after pull? Best Regards Andrew -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.osuosl.org/pipermail/darcs-users/attachments/20060217/39782ed7/attachment.htm