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

document how conflicts are handled with imports

Browse source
This commit is contained in:
Joey Hess 2019-03-05 14:55:06 -04:00
parent bec66258a8
commit f7be2e9d37
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/git-annex-export.mdwn
View file

@ -43,9 +43,6 @@ paragraph do not apply. Note that dropping content from such a remote is
not supported. See individual special remotes' documentation for not supported. See individual special remotes' documentation for
details of how to enable such versioning. details of how to enable such versioning.
You can combine using `git annex export` to send changes to a special
remote with `git annex import` to fetch changes from a special remote.
The `git annex sync --content` command (and the git-annex assistant) The `git annex sync --content` command (and the git-annex assistant)
can also be used to export a branch to a special remote, can also be used to export a branch to a special remote,
updating the special remote whenever the branch is changed. updating the special remote whenever the branch is changed.
@ -56,6 +53,17 @@ For example:
git config remote.myremote.annex-tracking-branch master git config remote.myremote.annex-tracking-branch master
git annex sync --content git annex sync --content
You can combine using `git annex export` to send changes to a special
remote with `git annex import` to fetch changes from a special remote.
When a file on a special remote has been modified, exporting to it will
not overwrite the modified file, and the export will not succeed.
You can resolve this conflict by using `git annex import`.
(Some types of special remotes such as S3 with versioning may instead
let an export overwrite the modified file; then `git annex import`
will create a sequence of commits that includes the modified file,
so the overwritten modification is not lost.)
# OPTIONS # OPTIONS
* `--to=remote` * `--to=remote`