todos

2012-07-07 11:56:23 -06:00 · 2012-07-07 11:56:23 -06:00 · 1b9ab0ef93
commit 1b9ab0ef93
parent 5e1cf9eda7
2 changed files with 8 additions and 0 deletions
--- a/doc/todo/assistant_git_sync_laddering.mdwn
+++ b/doc/todo/assistant_git_sync_laddering.mdwn
@ -0,0 +1,8 @@
+When the [[design/assistant]] is running on a pair of remotes, I've seen
+them get out of sync, such that every pull and merge results in a conflict,
+that then has to be auto-resolved. 
+
+This seems similar to the laddering problem described in this old bug:
+[[bugs/making_annex-merge_try_a_fast-forward]]
+
+--[[Joey]] 
--- a/doc/todo/assistant_threaded_runtime.mdwn
+++ b/doc/todo/assistant_threaded_runtime.mdwn