diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-06-01 12:46:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-06-01 12:51:01 -0400 |
| commit | de8f6959d3cd4af348e7a72c45e6e1d6d3cd4cfa (patch) | |
| tree | f63493430204d764d84a44a909f68b778b719716 /doc/git-annex-sync.mdwn | |
| parent | 5c058d99a26da3639afcbf855eb7b6ca3d628fb3 (diff) | |
configuration to disable automatic merge conflict resolution
* Added annex.resolvemerge configuration, which can be set to false to
disable the usual automatic merge conflict resolution done by git-annex
sync and the assistant.
* sync: Added --no-resolvemerge option.
Note that disabling merge conflict resolution is probably not a good idea
in a direct mode repo or adjusted branch. Since updates to both are done
outside the usual work tree, if it fails the tree is not left in a
conflicted state, and it would be hard to manually resolve the conflict.
Still, made annex.resolvemerge be supported in those cases for consistency.
This commit was sponsored by Riku Voipio.
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) |