A Save both, a recorded conflict and a damaged version file could each leave
a local version out of the chain or a copy half-made at the home. This round
makes every one of these end with nothing lost and nothing half done.
- Save both retry: a journaled copy somebody else sent a version to (or one
deleted since) is left as it is, and a new copy takes every local version.
A divergence met at the copy while sending also makes a new copy, once.
- Keep mine, Take server, or a pull that settles a conflict after a Save both
was cut short first send the rest of the journaled versions to that copy,
if it is still this workspace's. The journal is cleared at the commit point.
- A conflict of format met past local versions the home already stored
(their answer lost) now moves the base onto them, like any other conflict.
The conflict, the base and the chain then name one version. A save-both
journal follows the base when it moves.
- A conflict recorded before stays while the home holds no version after
the base. A base that has reached the conflict's head clears it.
- Take server no longer replays or sends the version it saves first when,
replayed, that version holds only the server's values. It stays in
versions/.replaced for the undo. The test checks the exact history again.
- Version files after the base that cannot be read, or that do not follow
from it, are listed (WorkspaceProject.UnreadableVersions). The new state
WorkspaceState.Damaged shows them. Commit, push, pull and resolve refuse to
go past them. A damaged file whose version the home holds takes the home's
copy at the next sync, and the damaged file is kept aside. Remove local
copy counts these files as unsent.
- PushOutcome.TooLarge raises its own WorkspaceSyncException message. The
desktop says Errors.Workspace.VersionTooLarge for it and for
ProjectVersionTooLargeException when a local commit is too large.
- The editor maps LeaseUnavailableException from opening a busy project to
Errors.Workspace.Busy.
- The copy job no longer deletes, during the pass, a proxy that the editor's
current media name. RemoveStale removes it after the commit. A resumed run
does not keep such a file as a frame whose photo changed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Review 2, phase 5a, fix round 1 (desktop and the engine side of Resolve and Restore).
- Resolve applies Keep mine / Take the library's only to the conflict the dialog listed:
when the head or what differs moved since, the new conflict is recorded and asked again;
Sync re-works a pending conflict instead of re-showing a stale list. Take the library's
first saves uncommitted changes as a version, and the editor takes it as one undo step
(toast Undo, Ctrl+Z) that brings back only the settings both changed.
- Restore saves unsaved changes as a version also while a conflict waits; a restore that
changed nothing, or was undone, no longer marks the next version as a Restore.
- The editor's saves and merges of a workspace project merge positions photo by photo
(portable form) and ask where both sides changed a setting, never deciding for ours.
- Read-only after a pull is signalled, and no save that can never be stored is left behind.
- The chip is read again after edits; a background conflict waits for the open dialog;
Send first and Delete show the conflict they met; Discard changes needs the typed name.
- Open project... reaches the library's other projects (Save both's sibling, also from
its toast); copies whose project or sequence is gone read Not in library and can be
removed from the picker's Workspace rows; a delete whose local copy stays says so.
- A workspace folder inside a library is refused before anything is written.
- Conflict and Compare lines name heroes, exclusions and keyframes; History shows the PC
name alone, never the program's prefixes.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>