diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-07 11:56:23 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-07 11:56:23 -0600 |
| commit | 1b9ab0ef93641ea06fa5f2fb97e2e03d6f6a95f2 (patch) | |
| tree | 677b79e7abbd61dcc8339f66534874c02eef8fb5 | |
| parent | 5e1cf9eda7bd19ac2dce53c84bca89f71c8a1260 (diff) | |
todos
| -rw-r--r-- | doc/todo/assistant_git_sync_laddering.mdwn | 8 | ||||
| -rw-r--r-- | doc/todo/assistant_threaded_runtime.mdwn (renamed from doc/todo/threaded_runtime.mdwn) | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/todo/assistant_git_sync_laddering.mdwn b/doc/todo/assistant_git_sync_laddering.mdwn new file mode 100644 index 000000000..f210d41f6 --- /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 index 095ffa435..095ffa435 100644 --- a/doc/todo/threaded_runtime.mdwn +++ b/doc/todo/assistant_threaded_runtime.mdwn |