diff options
Diffstat (limited to 'doc/todo/assistant_git_sync_laddering.mdwn')
| -rw-r--r-- | doc/todo/assistant_git_sync_laddering.mdwn | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/todo/assistant_git_sync_laddering.mdwn b/doc/todo/assistant_git_sync_laddering.mdwn deleted file mode 100644 index 7dbc6480a..000000000 --- a/doc/todo/assistant_git_sync_laddering.mdwn +++ /dev/null @@ -1,10 +0,0 @@ -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]] - -Think I've fixed this. [[done]] --[[Joey]] |