Add explicit sync state and persistent sync panel for conflict recovery #391
Merged
pradeeban merged 1 commit intoApr 24, 2026
Merged
Conversation
Author
|
Hey @pradeeban pls take a look 
conflict synced |
Author
|
@pradeeban sorry for the delay, had unit exams this week. I’m happy with how this feature came out and it matches what I wanted to deliver. Please review when you get time. |
Member
|
Hope the exam went very well. Welcome back. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This switches sync handling to explicit client states (synced/dirty/syncing/conflict/error) and adds a persistent sync panel with local/remote hash, last result, and direct recovery actions, while keeping the existing modal flow compatible.
I changed this because the old flow depended on response text and made conflicts easy to miss, and #387 asks for deterministic, visible conflict handling from one place.