- tmp = tempfile.NamedTemporaryFile(delete=False)
- tmp.write(contents)
- os.rename(tmp.name, fullpath)
+ 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