feat(#660): Implement offline-first conflict resolution for concurrent edits#723
Merged
RUKAYAT-CODER merged 1 commit intoJun 28, 2026
Conversation
…concurrent edits - Add lastKnownVersion and clientTimestamp fields to QueuedRequest for conflict detection - Handle 409 Conflict responses in axios interceptor with conflict data extraction - Create conflictStore (Zustand) to manage conflict queue and resolution state - Add ConflictResolutionModal component with diff view (local vs server) - Integrate modal into app layout for global conflict resolution UI - Add comprehensive unit tests for conflict handling, store, and modal Closes rinafcode#660
|
@zeemscript Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
Contributor
|
Thank you for contributing to the project. |
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
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.
Summary
Implements offline-first conflict resolution for concurrent edits, addressing the scenario where users edit notes, quiz drafts,
or profile information while offline and then reconnect to find their mutations conflict with server-side changes.
Changes
Test Plan
Closes #660