* Trent W. Buck <[EMAIL PROTECTED]> [081129 03:06]: > Before: > > | Mark any conflicts to the working copy for manual resolution. > | [...] > | Mark-conflicts is used to mark and resolve any conflicts that may exist in a > | repository. Note that this trashes any unrecorded changes in the working > | copy. > > After: > > | Mark any unresolved conflicts in working copy, for manual resolution. > | [...] > | Darcs requires human guidance to unify changes to the same part of a > | source file. When a conflict first occurs, darcs will add both > | choices to the working tree, delimited by markers. > | > | However, you might revert or manually delete these markers without > | actually resolving the conflict. In this case, `darcs mark-conflicts' > | is useful to show where any unresolved conflicts. It is also useful > | if `darcs apply' is called with --apply-conflicts, where conflicts > | aren't marked initially. > | > | Any unrecorded changes to the working tree *will* be lost forever when > | you run this command! You will be prompted for confirmation before > | this takes place. > | > | This command was historically called `resolve', and this deprecated > | alias still exists for backwards-compatibility. >
OK! Thanks for all this work! Christian -- You may use my gpg key for replies: pub 1024D/47F79788 2005/02/02 Christian Kellermann (C-Keen)
pgp19Q1eEHOlf.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
