Fix non-zero shell exit code and --continue in wrong directory.

[wizard.git] / TODO

diff --git a/TODO b/TODO
index 5762dee498fab20f7f24a78d8cec90e0cdba2109..08ace5d976bbd38a7044c0a958cd3cb1f77e6ca4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,9 +6,9 @@ TODO NOW:
 
 - Remerges aren't reflected in the parent files, so `git diff` output is
   spurious.  Not sure how to fix this w/o tree hackery.
-- Missing ancestor means that certain files cannot be merged, for the curious files;
-  this is indicated by 1,3 but missing 2.  There might be some cleverness to be
-  done here by finding a "fake" ancestor to use.
+- Sometimes users remove files. Well, if those files change, they automatically
+  get marked as conflicted.  Maybe we should say for certain files "if they're
+  gone, they're gone forever"?  What is the proper resolution?
 
 - wizard install wordpress should ask for password.  One problem with this is that
   Wordpress will still send mail with the wrong username and password, so Wordpress