Merge saved edits onto what others saved meanwhile
- github
- github/openchronology/timeline-app
- commit
- main
- github/athanclark
Closes #165. Save to server sent the editor's staged edits with the revision they were made on, and any save in between refused them (409, "Export your edits before reloading"). On a timeline being written to (syslog, a log import, any API client) that was every save, and the view stayed pinned to the old revision, failing as it panned. The editor now also sends what its edits were made on: each changed moment's and duration's version when it loaded it, and the settings as loaded. The server (server/save-merge.mjs) applies on the latest revision whatever no one else changed: a moment or duration both changed merges field by field, settings take the editor's value only where it changed them (images merge one by one), and links apply as asked. Conflicts (a field both changed differently, an edit to what someone deleted) save nothing and are named; the editor offers to keep its versions (sent without what they were made on, they replace the saved ones) or take the saved ones, then saves the rest. With what it was made on, a save is checked even on the latest revision. With edits staged, the editor now follows others' saves: it moves to the latest revision, taking settings it hasn't edited, and shows it under the edits. A save without what it was made on is refused on an older revision as before; the log writers are unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_011fFY8eruEi1xAkkMBni13B https://github.com/openchronology/timeline-app/commit/1c2fa25df897deabfbd9453c1441bec55b7568cf
Related
Open Merge saved edits onto what others saved meanwhile in the timeline