Take one side

tovio resolve <path> --ourstovio resolve <path> --theirstovio resolve <path> --base

Each of these replaces the whole file with that side.

The path is not optional here

Every strategy flag requires a path, and only one strategy may be given at a time. tovio resolve --ours on its own is refused rather than silently applied to everything.

Ours and theirs mean what you expect

Including during a rebase. When TOVIO re-parents your change onto a new base, ours is still your change and theirs is still the new base — the labels do not swap the way Git's do when it checks the upstream out as HEAD. If you have been burned by that before, you can stop compensating for it.

Check anyway

tovio cat <path> --side theirs

Reading the side before you take it costs about a second. Only ours, theirs and base are valid, and they are lowercase.

If the side you name is the one that deleted the file, cat tells you so rather than printing nothing and letting you draw the wrong conclusion.

Want a different side per region?

Use the interactive walk. The flags above are whole-file operations.

tovio resolve <path>

Recording why

tovio resolve <path> --theirs --why "their bounds check is the correct one"

Undo

tovio undo

Resolutions are op-log operations.