Understanding Darcs/Dealing with conflicts

Handle your conflicts at home

Resolving conflicts

For the moment, the best place to go for dealing with conflicts is the conflicts FAQ on darcs wiki.