History of a single file
If a file goes wrong, open it and click the History button on the right of the toolbar, or press ⌥⌘\. The Inspector on the right lists the file's earlier versions. Click a version to preview it, click the compare button at the end of a row to see the differences, and click Restore to put the file back to that version. Before restoring, Resomark saves a copy of the current content.
Sources
Section titled “Sources”Depending on where the file is, there are one or two sources to switch between at the top of the Inspector:
- Git: when the file is in a Git repository and has been committed, the commits that changed it, followed back past renames (Git History).
- Reso: when the file is in a Workspace with Track Changes on, the save points that touch it (Reso History).
- Mac: for files on this Mac, the versions macOS keeps when the file is saved (Mac Versions). Remote files have none.
Git and Reso never appear together. Each source is listed and compared separately, and with only one source there's nothing to switch. Only text files you can edit in Resomark have history; images, PDFs and similar files don't. For how the three differ, see Three kinds of history.
Preview a version
Section titled “Preview a version”Click a version in the list and the text switches to that version's content, read-only. A preview bar appears at the top of the editor, showing this version and the words Historical Version. Your current text and any unsaved changes aren't affected.
Click Cancel on the preview bar, or press Esc, to go back to the current content. Clicking the selected row again, switching to Info, or closing the Inspector does the same.
Compare
Section titled “Compare”- Click the compare button at the end of a row. If you aren't previewing another version, this compares that version with the current content; if you are, it compares the two versions.
- The older version always comes first and the newer one second, whichever you clicked first.
- You can only compare within one source; a Git version can't be compared with a Mac version.
- While previewing, turn on Show Diff (⇧⌘D) to compare this version with the current one; turn it off to see just this version again.
Restore
Section titled “Restore”While previewing a version, click Restore on the preview bar and confirm Restore This Version?. While comparing two versions there's no Restore; go back to a single version first.
Every source protects the current content first, including words you haven't saved:
- Restoring from Mac versions: the current content is saved as a new Mac version, then replaced with the version you chose. In a Workspace with Track Changes on, the restore counts as your own edit, so it doesn't show up as an outside change.
- Restoring from Git: the current content is saved as a Mac version, then Git restores just this one file. No branch switch, no commit, and the staging area isn't touched. This only works in a Workspace added at the repository's root folder; versions from before a rename can be viewed but not restored.
- Restoring from Reso History: the current content is saved as a save point named Before Restore, then replaced with this version. When it works you'll see "Version restored. The previous content is in History as Before Restore." Press ⌘Z right away to undo it. Track Changes has to be on; when a restore isn't possible, the preview bar says why.
Does it need Plus
Section titled “Does it need Plus”| View list | Preview | Compare | Restore | |
|---|---|---|---|---|
| Mac | Free | Free | Plus | Free |
| Git | Free | Plus | Plus | Plus |
| Reso | Free | Plus | Plus | Plus |
Without Plus, clicking a Git or Reso version opens the subscription window.
How long Mac versions are kept
Section titled “How long Mac versions are kept”File > Browse All Versions… is the version browser built into macOS. It's always available, with or without Plus.