1git-annex-merge(1) General Commands Manual git-annex-merge(1)
23
4
NAME
6git-annex-merge - automatically merge changes from remotes
7
SYNOPSIS
9git annex merge
10
DESCRIPTION
12This performs the same merging (and merge conflict resolution) that is
13done by the sync command, but without pushing or pulling any data.
1415
When annex.resolvemerge is set to false, merge conflict resolution will
16not be done.
17
SEE ALSO
19git-annex(1)
2021
git-annex-sync(1)
22
AUTHOR
24Joey Hess <id@joeyh.name>
2526
git-annex-merge(1)