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

NAME

6       git-annex-resolvemerge - resolve merge conflicts
7

SYNOPSIS

9       git annex resolvemerge
10

DESCRIPTION

12       Resolves a conflicted merge, by adding both conflicting versions of the
13       file to the tree, using variants of their filename. This is done  auto‐
14       matically when using git annex sync or git annex merge.
15
16       Note  that  only merge conflicts that involve one or more annexed files
17       are resolved. Merge conflicts between two files that  are  not  annexed
18       will not be automatically resolved.
19

EXAMPLE

21       Suppose  Alice  commits a change to annexed file foo, and Bob commits a
22       different change to the same file foo.
23
24       Merging between them will then fail, and git  will  present  the  merge
25       conflict  as  a  file foo pointing to one version of the git-annex sym‐
26       link, with git status indicating that foo has an unresolved conflict.
27
28       Running git annex resolvemerge in this situation will resolve the merge
29       conflict,  by  replacing  the  file foo with files named like foo.vari‐
30       ant-c696 and foo.variant-f16a. One of the files has  the  content  that
31       Alice committed, and the other has the content that Bob committed.
32
33       The  user  can  then  examine  the two variants of the file, and either
34       merge the two changes into a single file, or rename one of them back to
35       foo and delete the other.
36

SEE ALSO

38       git-annex(1)
39

AUTHOR

41       Joey Hess <id@joeyh.name>
42
43                                                     git-annex-resolvemerge(1)