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

NAME

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

SYNOPSIS

9       git annex merge [branch]
10

DESCRIPTION

12       When  run  without  any parameters, this performs the same merging (and
13       merge conflict resolution) that is done by the git-annex pull and  git-
14       annex sync commands, but without uploading or downloading any data.
15
16       When  a  branch  to  merge is specified, this merges it, using the same
17       merge conflict resolution as the git-annex pull command. This is  espe‐
18       cially  useful  on  an adjusted branch, because it applies the same ad‐
19       justment to the branch before merging it.
20
21       When annex.resolvemerge is set to false, merge conflict resolution will
22       not be done.
23

OPTIONS

25       --allow-unrelated-histories, --no-allow-unrelated-histories
26
27              Passed  on to git merge, to control whether or not to merge his‐
28              tories that do not share a common ancestor.
29
30       --json Enable JSON output. This is intended to be  parsed  by  programs
31              that use git-annex. Each line of output is a JSON object.
32
33       --json-error-messages
34              Messages that would normally be output to standard error are in‐
35              cluded in the JSON instead.
36
37       Also, the git-annex-common-options(1) can be used.
38

SEE ALSO

40       git-annex(1)
41
42       git-annex-pull(1)
43
44       git-annex-sync(1)
45
46       git-annex-adjust(1)
47

AUTHOR

49       Joey Hess <id@joeyh.name>
50
51                                                            git-annex-merge(1)