Kinds of Workspace
Workspaces come in three kinds, depending on who records changes. When the folder is a Git repository, Git records them. When it's outside Git and Track Changes is on, Resomark records them. When it's outside Git and not tracked, nobody does. You don't pick the kind yourself: when you add a folder, Resomark checks whether it's in a Git repository, and then whether you turned on Track Changes.
At a glance
Section titled “At a glance”| Git repository | Outside Git, Track Changes on | Outside Git, not tracked | |
|---|---|---|---|
| Changes are compared with | The last commit | What you've accepted | Nothing |
| Changes in the sidebar, file name colors, marks in the text | Yes | Yes | No |
| Keep and revert | No; use your Git tools | Yes | No |
| History of the whole folder | Commit History | Workspace History | None |
| History of a single file | Git (committed files), Mac | Reso, Mac | Mac |
| Needs Plus | Seeing changes is free; opening commits and switching worktrees and branches need Plus | Plus, with a free 14-day trial | Free |
How each column works: Uncommitted changes in a Git repository, Track Changes, Three kinds of history.
Git repository: add the root folder
Section titled “Git repository: add the root folder”Add the repository's top-level folder (the one that contains .git), and the card in the add window says Git repository. A Git repository has no Track Changes switch, and Resomark doesn't keep a separate history for it.
If you add a subfolder inside a repository, Git still manages those files, but this Workspace doesn't show Git changes or commits. Where Changes would be, there's only the line "This folder is inside a Git repository. Add the repository root as a Workspace to review its changes." When you add such a folder, the card has a Use “repository name” button; click it to switch to the repository's root folder.
Outside Git: Track Changes on or off
Section titled “Outside Git: Track Changes on or off”Track Changes is on by default in the add window. With it on, Resomark records what's in the folder from that moment, and lists whatever other apps change afterward. With it off, it's an ordinary folder: you can read and write, and nothing is compared. You can change this at any time by right-clicking the Workspace and choosing Workspace Settings….
Once the trial is over and you don't have Plus, the switch is off by default for newly added folders, with a PLUS badge next to it.
Two special cases
Section titled “Two special cases”- Temporary Location: when you open a file from Finder that isn't in any Workspace, the sidebar shows the folder it's in. That isn't a Workspace: changes aren't tracked, there's no Changes section or folder history, and there are no backlinks. To use it for the long run, click Add as Workspace.
- Remote Workspaces: folders you open over SSH come in the same three kinds. Their changes and history are recorded on the remote computer, so several Macs opening the same remote folder see the same records. Remote files have no Mac versions. Remote Workspaces are a Plus feature; see Remote Workspaces.
When things change along the way
Section titled “When things change along the way”- You run
git initin the folder: Changes switches to Git's, and a one-time notice says "“folder name” is a Git repository now. Workspace History is paused, and existing history stays." - You delete
.git: if Track Changes is on, tracking starts again from what's on disk at that moment, and the existing Workspace History carries on. A remote Workspace switches over only after you reconnect. - Another Git repository is nested inside the folder: that subfolder isn't tracked, and the ⓘ next to the Changes heading lists it. To see its changes, add it as a Workspace of its own.
How to tell which kind it is
Section titled “How to tell which kind it is”Look at the button next to the big title on the folder page. A Git repository has Commit History. A folder with Track Changes on has a clock, Workspace History. One with tracking off has a clock with a slash through it; hover over it to see "Workspace History · Tracking Off". The folder page of a Git repository also has a button at the top showing the worktree and branch.