git-annex-resolvemerge(1) resolve merge conflicts


git annex resolvemerge


Resolves a conflicted merge, by adding both conflicting versions of the file to the tree, using variants of their filename. This is done automatically when using git annex sync or git annex merge.

Note that only merge conflicts that involve an annexed file are resolved. Merge conflicts between two files that are not annexed will not be automatically resolved.


Joey Hess <[email protected]>