diff options
Diffstat (limited to 'doc/git-annex-sync.mdwn')
| -rw-r--r-- | doc/git-annex-sync.mdwn | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/doc/git-annex-sync.mdwn b/doc/git-annex-sync.mdwn index a27d31565..2aa009cf8 100644 --- a/doc/git-annex-sync.mdwn +++ b/doc/git-annex-sync.mdwn @@ -21,11 +21,6 @@ worry about the details, you can use sync. The content of annexed objects is not synced by default, but the --content option (see below) can make that also be synchronized. -Merge conflicts are automatically handled by sync. When two conflicting -versions of a file have been committed, both will be added to the tree, -under different filenames. For example, file "foo" would be replaced -with "foo.somekey" and "foo.otherkey". - Note that syncing with a remote will not normally update the remote's working tree with changes made to the local repository. (Unless it's configured with receive.denyCurrentBranch=updateInstead.) However, those changes @@ -114,6 +109,18 @@ by running "git annex sync" on the remote. less efficient. When --content is synced, the files are processed in parallel as well. +* `--resolvemerge`, `--no-resolvemerge` + + By default, merge conflicts are automatically handled by sync. When two + conflicting versions of a file have been committed, both will be added + to the tree, under different filenames. For example, file "foo" + would be replaced with "foo.variant-A" and "foo.variant-B". (See + [[git-annex-resolvemerge]](1) for details.) + + Use `--no-resolvemerge` to disable this automatic merge conflict + resolution. It can also be disabled by setting annex.resolvemerge + to false. + # SEE ALSO [[git-annex]](1) |