Understanding Darcs/Dealing with conflicts

< Understanding Darcs

Handle your conflicts at homeEdit

Resolving conflictsEdit

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

Next Page: Patch theory | Previous Page: Undoing mistakes

Home: Understanding Darcs