[darcs-users] what does "darcs resolve" do?

[Juliusz Chroboczek]

> # For every conflict I've seen thus far (on pulls, even) I've had to call
> # darcs resolve to get the conflict marked and the working copy changed.
> # I went to the manual to double check what the default behavior is and
> # noticed that is a bit conflicted about it...

> # Anyone know the reason for this conflict in the manual/experience?

The default behaviour of Darcs is:

 - mark new conflicts on pull, but not old conflicts;
 - don't mark conflicts on revert.

Darcs resolve walks the whole repository, and marks all conflicts, no
matter how old.

                                        Juliusz