git-annex-merge






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.


git‐annex(1)

     git‐annex−sync(1)


Joey Hess <id@joeyh.name>