git-annex-merge - automatically merge changes from remotes
git annex merge
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
Joey Hess <email@example.com>