mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into importtree

Browse source
This commit is contained in:
Joey Hess 2019-02-22 22:03:00 -04:00
commit c5ceefdca6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/design/importing_trees_from_special_remotes.mdwn
View file

@ -36,6 +36,14 @@ would be ok to make a commit with no parent. git merge would then need
--allow-unrelated-histories, and it would be more likely for the merge to
have conflicts.
It's also possible for the export log to indicate an unresolved export
conflict, so two trees got exported to the remote independently. The
content of the remote is not known at this point, but import will resolve
that by getting a list of its contents. So, in this case, use the multiple
commits that are in the export log as the parent of the generated commit,
which nicely indicates to git that there was a conflict and it got
resolved.
## command line interface
`git annex import --from remote` would import files from the remote to the