diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-02-09 12:30:29 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-02-09 12:30:29 -0400 |
commit | 420857fa3c5340b1baa7b3dac7cab746c5a35623 (patch) | |
tree | 6bf34da1a03ba5e050e9066d89a65a94ef7b400a /doc/todo | |
parent | e6c7e3471f6aac0f3d4cb32a5b316df5ab7fc118 (diff) |
added adjusted_branches design doc, meets at least 2 different needs
Diffstat (limited to 'doc/todo')
-rw-r--r-- | doc/todo/deferred_update_mode.mdwn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/todo/deferred_update_mode.mdwn b/doc/todo/deferred_update_mode.mdwn index 9eef53615..46e197f01 100644 --- a/doc/todo/deferred_update_mode.mdwn +++ b/doc/todo/deferred_update_mode.mdwn @@ -26,3 +26,8 @@ annex.merge=trydownloadfirst and annex.merge=reqdownloadfirst Let `git annex merge` be used to force a merge, even when content is not available. + +> I think this is the wrong solution, and [[hide_missing_files]] is a +> better approach to the same problem. See [[design/adjusted_branches]]. +> +> Closing as dup. [[done]] --[[Joey]] |