Accept what is already on disk

tovio resolve <path> --working-treetovio resolve <path> --merged

Accepts the current bytes on disk as the resolution. --merged is an accepted alias, though it is not listed in --help.

The workflow

1. Read the sides: tovio cat <path> --side ours and --side theirs.
2. Edit the file into what you want.
3. tovio resolve <path> --working-tree.

Which conflicts it applies to

This is a whole-file byte merge, so it is valid only where bytes are what the sides disagree about: content, add-add and rename-edit.

On a delete-modify, a rename-rename, a mode or an entry-kind conflict there is no merged byte content to accept, and the command refuses with TVO-CONFLICT-015. The error points you at tovio status --conflicts to see the kind; the strategy that kind does take is in the typed-conflicts article.

It is also whole-file by definition, so it cannot be combined with --region. Pick one or the other.

Why this is clean here

Your file was never rewritten with marker lines, so what is on disk is your own work rather than a merge tool's output with leftovers in it. There is no risk of committing a stray <<<<<<<, because none was ever inserted.

Using an external merge tool

TOVIO does not launch one, and has no --tool flag. If you want one, run it yourself, write the merged result to the file, then use --working-tree. TOVIO takes the bytes and does not care how they got there.

Undo

tovio undo