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-merge.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-merge.mdwn')
| -rw-r--r-- | doc/git-annex-merge.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/git-annex-merge.mdwn b/doc/git-annex-merge.mdwn index 3001e9bed..bb204d725 100644 --- a/doc/git-annex-merge.mdwn +++ b/doc/git-annex-merge.mdwn @@ -12,6 +12,9 @@ This performs the same merging (and merge conflict resolution) that is done by the sync command, but without pushing or pulling any data. +When annex.resolvemerge is set to false, merge conflict resolution +will not be done. + # SEE ALSO [[git-annex]](1) |