Understanding Darcs/Dealing with conflicts
Handle your conflicts at home edit
Resolving conflicts edit
For the moment, the best place to go for dealing with conflicts is the conflicts FAQ on darcs wiki.
For the moment, the best place to go for dealing with conflicts is the conflicts FAQ on darcs wiki.