Understanding darcs/Dealing with conflicts

From Wikibooks, the open-content textbooks collection

Jump to: navigation, search

[edit] Handle your conflicts at home

[edit] Resolving conflicts

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

Retrieved from "http://en.wikibooks.org/wiki/Understanding_darcs/Dealing_with_conflicts"