Files
Chronos/tests/Chronos.Data.Tests/Workspaces
Alby96andClaude Opus 5.5 8256b72913 fix: integrate phase 5a fix round 1
Taking the server's values now saves unsaved changes as a version first
(desktop fix), while a conflict of format refuses that choice (merge fix):
the save is skipped for a conflict of format, so a refused choice leaves
the local versions as they were. A project that moves onto a newer
Chronos's head with nothing of its own now adopts the home's copies of
the local versions the home already held, as a replay does, since the
replay no longer writes over unsent files before the base moves
(workspace fix). The recovery test of a conflict met past a held version
checks the versions before the one Take the server's saves first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 10:49:53 +01:00
..