[darcs-users] how to merge if there is conflict?

Ruini Xue xueruini at gmail.com
Fri Feb 17 11:31:26 UTC 2006


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 


More information about the darcs-users mailing list