Understanding Darcs/Dealing with conflicts

From Wikibooks, open books for an open world
Jump to: navigation, search

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.

Next Page: Patch theory | Previous Page: Undoing mistakes

Home: Understanding Darcs