94351daba6
* 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.
28 lines
505 B
Markdown
28 lines
505 B
Markdown
# NAME
|
|
|
|
git-annex merge - automatically merge changes from remotes
|
|
|
|
# SYNOPSIS
|
|
|
|
git annex merge
|
|
|
|
# DESCRIPTION
|
|
|
|
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)
|
|
|
|
[[git-annex-sync]](1)
|
|
|
|
# AUTHOR
|
|
|
|
Joey Hess <id@joeyh.name>
|
|
|
|
Warning: Automatically converted into a man page by mdwn2man. Edit with care.
|