Three kinds of history
Resomark shows three kinds of history, from three places. A Git repository has its commits, recorded when you commit. A folder outside Git with Track Changes on has the Workspace History that Resomark records (called Reso History on a single file). And files on this Mac also have the Mac versions macOS keeps when a file is saved. On any one file, Git and Reso never appear together; Mac versions can sit alongside either.
Side by side
Section titled “Side by side”| Git History | Workspace History / Reso History | Mac versions | |
|---|---|---|---|
| Who records it | You, when you commit | Resomark, on its own by its rules; you can also add save points by hand | macOS, when the file is saved |
| Where it exists | Any Git repository | Workspaces outside Git with Track Changes on | Files on this Mac; remote files have none |
| What it covers | The whole repository, or just one file | The whole Workspace, or just one file | One file |
| What it stores | The content at each commit | The content you've accepted | The whole file at each save |
| Where it's stored | In the repository, in .git |
In Resomark's app data on this Mac; for a remote Workspace, on the remote computer | Managed by macOS |
| How long it's kept | Up to your repository | Not cleaned up on its own, for now | Up to macOS; Apple hasn't published how long |
| Whole folder | Commit History | Workspace History | — |
| Single file | Git, in History in the Inspector | Reso, in History in the Inspector | Mac, in History in the Inspector |
| Needs Plus | List is free; opening commits, seeing old content, comparing and restoring need Plus | List is free; opening a version, comparing and restoring need Plus | Viewing and restoring are free; comparing needs Plus |
How to use each: Commit History, Workspace History, History of a single file.
A copy is saved before you restore
Section titled “A copy is saved before you restore”Before you restore a file to an old version from any kind of history, Resomark first saves the current content, including words you haven't saved yet. Restoring from Git or a Mac version saves it as a new Mac version; restoring from Reso History saves it as a save point named Before Restore. If you restore the wrong version, you can still get back what you had.
What history doesn't include
Section titled “What history doesn't include”- Outside changes you reverted: revert means discard, so they aren't in any history.
- In-between states you never accepted: Workspace History stores what you've accepted. If an AI changes a file to A and then to B, and you didn't keep A while it was there, A isn't in Workspace History.
- Old content of images, PDFs, audio and video: Track Changes only records that they changed; it doesn't store old versions.
- Git changes you haven't committed: Git history only has what was committed.
The system's version browser
Section titled “The system's version browser”File > Browse All Versions… opens the version browser built into macOS, which shows Mac versions. It's always available, with or without Plus.