Understanding Darcs/Dealing with conflicts

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