This is the command git-annex-resolvemerge that can be run in the OnWorks free hosting provider using one of our multiple free online workstations such as Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator
PROGRAM:
NAME
git-annex-resolvemerge - resolve merge conflicts
SYNOPSIS
git annex resolvemerge
DESCRIPTION
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.
Use git-annex-resolvemerge online using onworks.net services