TODO NOW:
-- Symlinked rerere to get awesomeness. Problems:
- - Permissions
- - Might not make a huge difference; how does it handle empty file
- and removed file cases?
- - Need to manually run git rerere subsequently to reap benefits
- - Majority of resolutions have to happen pre-merge (see below)
-- Create 'wizard merge' command
- - Uses application specific hinting to prematurely resolve
- conflicts.
- - Newline resolution gets done prior-merge (presently is done
- post merge).
- - Classes of disappeared files made ok.
- - Make this general utility(?)
-
+- Symlinked rerere to get awesomeness. Consider permissions
+- Wordpress needs to get rid of the siteurl hack, so that it actually
+ has a fully-qualified URL http://foo.scripts.mit.edu/blah. This will
+ also fix Wordpress's cron functionality. We should be careful not
+ to write over users who are on vhosts. We should figure out who is
+ still on twiddle paths. We should make sure the redirect is handled
+ correctly.
- Wizard needs a correct arch/ setup
- The wizard command, when not on scripts, should automatically SSH to
scripts and start executing there?