fix(sync): Use correct variable for remoteUpdateTime in mergeWithUpdate#6699
Open
shakecodeslikecray wants to merge 1 commit intoChatGPTNextWeb:mainfrom
Open
fix(sync): Use correct variable for remoteUpdateTime in mergeWithUpdate#6699shakecodeslikecray wants to merge 1 commit intoChatGPTNextWeb:mainfrom
shakecodeslikecray wants to merge 1 commit intoChatGPTNextWeb:mainfrom
Conversation
Bug ID: WR-004 File: app/utils/sync.ts:156 Severity: high The mergeWithUpdate function has a bug where remoteUpdateTime is incorrectly assigned from localState.lastUpdateTime instead of remoteState.lastUpdateTime. This causes incorrect merge behavior and could lead to data loss when syncing. Fixed by whiterose
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
1 participant
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
mergeWithUpdatefunction whereremoteUpdateTimewas incorrectly assigned fromlocalState.lastUpdateTimeinstead ofremoteState.lastUpdateTimeProblem
In
app/utils/sync.ts:156, the code was:This caused incorrect merge behavior because the function was comparing
localUpdateTimewith itself (vialocalState.lastUpdateTime), rather than comparing local vs remote timestamps. This could lead to data loss during sync operations.Fix
Changed to use the correct variable:
Test plan
🤖 Generated with Claude Code
Bug discovered by whiterose