Implement MediaWiki scaffolding for auto conflict resolution; untested.

[wizard.git] / wizard / deploy.py

diff --git a/wizard/deploy.py b/wizard/deploy.py
index 366fcfaa78d0d6cf2f3f9b372feb033202a2ee9e..bdea87e4385cd20421866a7276d0e0ca506a61e1 100644 (file)
--- a/wizard/deploy.py
+++ b/wizard/deploy.py
@@ -373,6 +373,14 @@ class Application(object):
                 contents = contents.replace(key, value)
             f = open(fullpath, "w")
             f.write(contents)
+    def resolveConflicts(self, dir):
+        """
+        Takes a directory with conflicted files and attempts to
+        resolve them.  Returns whether or not all conflicted
+        files were resolved or not.  Fully resolved files are
+        added to the index, but no commit is made.
+        """
+        return False
     def prepareConfig(self, deployment):
         """
         Takes a deployment and replaces any explicit instances