stg-resolved(1)
===============

NAME
----
stg-resolved - Mark a file conflict as solved

SYNOPSIS
--------
[verse]
'stg' resolved [options] [<files...>]

DESCRIPTION
-----------

Mark a merge conflict as resolved. The conflicts can be seen with the
'status' command, the corresponding files being prefixed with a
'C'.

OPTIONS
-------
-a::
--all::
        Mark all conflicts as solved.

-r (ancestor|current|patched)::
--reset (ancestor|current|patched)::
        Reset the file(s) to the given state.

-i::
--interactive::
        Run the interactive merging tool.

StGit
-----
Part of the StGit suite - see manlink:stg[1]
