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.
Joey Hess email@example.com
Warning: Automatically converted into a man page by mdwn2man. Edit with care.