1git-annex-merge(1)          General Commands Manual         git-annex-merge(1)
2
3
4

NAME

6       git-annex-merge - automatically merge changes from remotes
7

SYNOPSIS

9       git annex merge
10

DESCRIPTION

12       This  performs the same merging (and merge conflict resolution) that is
13       done by the sync command, but without pushing or pulling any data.
14
15       When annex.resolvemerge is set to false, merge conflict resolution will
16       not be done.
17

SEE ALSO

19       git-annex(1)
20
21       git-annex-sync(1)
22

AUTHOR

24       Joey Hess <id@joeyh.name>
25
26                                                            git-annex-merge(1)