Skip to main content
When a file you’re editing also changes outside the editor — a formatter rewrites it, an agent edits it, git checkout swaps branches, or another tool touches it — Vorto helps in two ways: it reacts to the change on disk (auto-reload), and it highlights and resolves any conflict markers that result.

​
Conflict markers

Vorto recognizes standard git conflict blocks and highlights them, layered under your syntax colors:
Each marker line (<<<<<<<, =======, >>>>>>>, and the diff3 base marker |||||||) gets a colored bar, and the “ours” and “theirs” sides each get a dim tint so the two halves are easy to tell apart at a glance. This works on conflicts produced by git and on the markers that autoreload = "merge" writes (see below).

​
Resolve a conflict

Put the cursor inside a conflict and run :conflict with the side you want to keep. The whole block is replaced in a single, undoable edit: The subcommands carry aliases that match how you think about the conflict: ours also accepts local / top, theirs also accepts disk / bottom, both accepts all, and none accepts remove.

​
Auto-reload

When the active buffer’s backing file changes on disk, Vorto reacts according to the autoreload setting in [editor]. It accepts three modes:
The setting can be overridden per language — set autoreload inside a [languages.<name>] table to use a different mode for that language. For backward compatibility, the legacy boolean form still works: autoreload = true maps to "replace" and autoreload = false maps to "none".

​
Reload manually

Regardless of the mode, you can always reload from disk on demand:
autoreload = "merge" and the :conflict resolver pair up: when a merge leaves conflict markers, navigate them with ]c / [c and resolve each with :conflict ours / theirs / both / none, exactly as you would a git conflict.

​
See also

Editor settings

The [editor] reference, including autoreload.

Commands

The : command reference, including :conflict and :reload.