From 1b9ab0ef93641ea06fa5f2fb97e2e03d6f6a95f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 7 Jul 2012 11:56:23 -0600 Subject: [PATCH] todos --- doc/todo/assistant_git_sync_laddering.mdwn | 8 ++++++++ ...eaded_runtime.mdwn => assistant_threaded_runtime.mdwn} | 0 2 files changed, 8 insertions(+) create mode 100644 doc/todo/assistant_git_sync_laddering.mdwn rename doc/todo/{threaded_runtime.mdwn => assistant_threaded_runtime.mdwn} (100%) diff --git a/doc/todo/assistant_git_sync_laddering.mdwn b/doc/todo/assistant_git_sync_laddering.mdwn new file mode 100644 index 0000000000..f210d41f60 --- /dev/null +++ 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]] diff --git a/doc/todo/threaded_runtime.mdwn b/doc/todo/assistant_threaded_runtime.mdwn similarity index 100% rename from doc/todo/threaded_runtime.mdwn rename to doc/todo/assistant_threaded_runtime.mdwn