added adjusted_branches design doc, meets at least 2 different needs

This commit is contained in:
Joey Hess 2016-02-09 12:30:29 -04:00
parent 0cc8c8ffa7
commit edc5829785
Failed to extract signature
3 changed files with 61 additions and 3 deletions

View file

@ -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]]