This commit is contained in:
Joey Hess 2016-02-09 16:26:55 -04:00
parent 5d05aad74c
commit 73cca6e8c1
Failed to extract signature
2 changed files with 13 additions and 4 deletions

View file

@ -27,7 +27,9 @@ 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]]
## alternatively
What about just making `git-annex sync --content` try to get the content of
all files before updating the work tree? (The assistant would need changes
too; it would need to queue all the downloads and trigger a work tree
update once all the downloads have been tried.)