BRIEF §14.5 asks for an explicit conflict prompt when both sides changed. A save
of a server sequence that meets settings someone changed to other values on the
server now stops (the change stays pending) and the editor asks: Keep mine saves
the editor's values over the server's, Take server (the safe default) shows the
server's values as one undoable step, so Ctrl+Z brings the editor's back. Both
first take in what only the server changed. Settings changed on one side only
still merge silently; a reload after an analysis never merges over a conflicting
pending change. The Export "Sync" box moves under Save to so neither is cut in
longer languages.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
- Tests for undo after adopted changes, run ending, saver retries and stop,
the local source refusing unsaved writes, re-solves without decoding and equal
to a fresh preparation, 1:1 pictures, waveform, crop margins and the values of
the Optimise toast; the Windows smoke test checks Render, Batch, the waveform,
1:1, the window title and the hidden idle job bar.
- The capture sample has a manual value and camera keyframes; the capture adds
the overlays, the waveform, the Optimise toast and Export.html's tool state.
- Crop margins live in a WPF-free class; a discarded change stops retrying.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC