External changes and conflicts

Last updated Screenshots show Folora 0.2.0.

Folora watches open files. When another app changes a file, what happens depends on whether the document has unsaved changes in Folora.

No unsaved changes

Folora loads the new content from disk. If only the modification time changed and the content is the same, nothing happens.

Unsaved changes

Autosave pauses, and the notification bar shows “The file changed externally. Autosave is paused.” with View changes and Save a copy.

  1. Click View changes to see the differences between the two versions: − marks the disk content and + marks your current edits.
  2. In the comparison, choose one of:
    • Use disk version: loads the version on disk and saves your current edits as a copy.
    • Keep my version: overwrites the file on disk with your current edits and saves the disk version as a copy. The disk version is checked once more before it is overwritten.
    • Save a copy: saves your current edits to a location you choose.
The comparison: − and + mark the lines that differ between the disk version and the current edits
The comparison: − and + mark the lines that differ between the disk version and the current edits

Copies are stored in the original file’s folder. Their names add .conflict-disk- or .conflict-mine- and a random string to the original name, for example Notes.conflict-disk-<random>.md. The notification bar shows the copy’s full path.

File moved or deleted

If the file is renamed within the same folder, the tab switches to the new name. If the file cannot be found, the notification bar shows “… was moved or deleted. Its text is still here.” with Save as and Close tab.

Read-only files

If the file is read-only, the notification bar shows “This file is read-only. Save your changes as a copy.” with Save a copy.

FOLORA