git-annex-merge - Man Page
merge changes from remotes
git annex merge [branch]
When run without any parameters, this performs the same merging (and merge conflict resolution) that is done by the sync command, but without pushing or pulling any data.
When a branch to merge is specified, this merges it, using the same merge conflict resolution as the sync command. This is especially useful on an adjusted branch, because it applies the same adjustment to the branch before merging it.
When annex.resolvemerge is set to false, merge conflict resolution will not be done.
- --allow-unrelated-histories, --no-allow-unrelated-histories
Passed on to git merge, to control whether or not to merge histories that do not share a common ancestor.
Also, the git-annex-common-options(1) can be used.
Joey Hess <firstname.lastname@example.org>