EnglishFrenchSpanish

OnWorks favicon

git-annex-resolvemerge - Online in the Cloud

Run git-annex-resolvemerge in OnWorks free hosting provider over Ubuntu Online, Fedora Online, Windows online emulator or MAC OS online emulator

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


Free Servers & Workstations

Download Windows & Linux apps

Linux commands

  • 1
    abicheck
    abicheck
    abicheck - check application binaries
    for calls to private or evolving symbols
    in libraries and for static linking of
    some system libraries. ...
    Run abicheck
  • 2
    abicompat
    abicompat
    abicompat - check ABI compatibility
    abicompat checks that an application
    that links against a given shared
    library is still ABI compatible with a
    subsequent ve...
    Run abicompat
  • 3
    cpbm
    cpbm
    cpbm - a software analysis toolkit
    (originally: CPROVER benchmarking
    framework) ...
    Run cpbm
  • 4
    cpclean
    cpclean
    cpclean - Remove wrong control points
    by statistical methods ...
    Run cpclean
  • 5
    fwb_compile_all
    fwb_compile_all
    fwb_compile_all - Wrapper script that
    compiles policies for multiple firewall
    objects ...
    Run fwb_compile_all
  • 6
    fwb_iosacl
    fwb_iosacl
    fwb_ipt - Policy compiler for Cisco IOS
    ACL ...
    Run fwb_iosacl
  • More »

Ad