git-annex-merge

git-annex-merge(1)           General Commands Manual          git-annex-merge(1)



NAME
       git-annex-merge - merge changes from remotes

SYNOPSIS
       git annex merge [branch]

DESCRIPTION
       When run without any parameters, this performs the same merging (and
       merge conflict resolution) that is done by the sync command, but without
       pushing or pulling any data.

       When a branch to merge is specified, this merges it, using the same merge
       conflict resolution as the sync command. This is especially useful on an
       adjusted branch, because it applies the same adjustment to the branch
       before merging it.

       When annex.resolvemerge is set to false, merge conflict resolution will
       not be done.

SEE ALSO
       git-annex(1)

       git-annex-sync(1)

       git-annex-adjust(1)

AUTHOR
       Joey Hess <id@joeyh.name>

                                                              git-annex-merge(1)