Changeset 196 in tailor

Timestamp:

12/26/04 02:44:45 (8 years ago)

Author:

Mark Stosberg <mark@…>

Hash name:

20041226014445-20bb4-4de7afffe7b1cf0766a8b6ffe7c21cf82aa91b04

Message:

mention how conflict resolution works

I hope this documentation is right based on my reading of the code. :) I only
found mentions of conflict handling in source.py and svn.py. If there are
specific other systems that do or do not handling conflict resolution, that
would be great to document as well.

File:

• README (modified) (1 diff)

README

@@ -68 +68 @@
 
   $ tailor.py ~/svnwc/MyProduct
+
+Resolving Conflicts
+===================
+
+If any conflicts are found, tailor.py will flag them and prompt the user to
+correct them.