Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show conflicts errors when I try opening the file with conflicts #218061

Closed
Tyriar opened this issue Jun 25, 2024 · 1 comment · Fixed by #219936
Closed

Show conflicts errors when I try opening the file with conflicts #218061

Tyriar opened this issue Jun 25, 2024 · 1 comment · Fixed by #219936
Assignees
@sandy081
Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders settings-sync verified Verification succeeded
Milestone
July 2024

Comments

@Tyriar
Copy link
Member

Tyriar commented Jun 25, 2024

Screenshot 2024-06-25 at 7 13 47 AM

Clicking settings.json here gives me an error:

Screenshot 2024-06-25 at 7 13 34 AM

Log

2024-06-25 07:12:58.609 [info] Using settings sync service https://vscode-sync-insiders.trafficmanager.net/
2024-06-25 07:12:58.609 [info] Auto Sync is enabled.
2024-06-25 07:12:58.609 [info] Auto Sync: Suspended until auth token is available.
2024-06-25 07:12:59.256 [info] Auto Sync: Triggered by Interval
2024-06-25 07:12:59.256 [info] Sync started.
2024-06-25 07:13:00.506 [info] Settings: Detected conflicts while synchronizing settings.
2024-06-25 07:13:00.937 [info] Keybindings: No changes found during synchronizing keybindings.
2024-06-25 07:13:01.453 [info] Snippets: No changes found during synchronizing snippets.
2024-06-25 07:13:01.525 [info] Tasks: No changes found during synchronizing tasks.
2024-06-25 07:13:01.533 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/extensions
2024-06-25 07:13:01.539 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/globalState
2024-06-25 07:13:01.556 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/keybindings
2024-06-25 07:13:01.560 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/profiles
2024-06-25 07:13:01.566 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/settings
2024-06-25 07:13:01.569 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/snippets
2024-06-25 07:13:01.593 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/tasks
2024-06-25 07:13:01.752 [info] GlobalState: Updated remote ui state. Updated: colorThemeData.
2024-06-25 07:13:01.757 [info] GlobalState: Updated last synchronized ui state
2024-06-25 07:13:01.758 [info] Extensions: Last sync resource does not exist locally.
2024-06-25 07:13:01.822 [info] Extensions: No changes found during synchronizing extensions.
2024-06-25 07:13:01.822 [info] Profiles: Last sync resource does not exist locally.
2024-06-25 07:13:01.861 [info] Profiles: No changes found during synchronizing profiles.
2024-06-25 07:13:01.865 [info] Syncing profile. test
2024-06-25 07:13:01.869 [info] Settings (test): No changes found during synchronizing settings.
2024-06-25 07:13:01.872 [info] Keybindings (test): No changes found during synchronizing keybindings.
2024-06-25 07:13:01.873 [info] Snippets (test): No changes found during synchronizing snippets.
2024-06-25 07:13:01.874 [info] Tasks (test): No changes found during synchronizing tasks.
2024-06-25 07:13:01.878 [info] GlobalState (test): No changes found during synchronizing ui state.
2024-06-25 07:13:01.895 [info] Extensions (test): No changes found during synchronizing extensions.
2024-06-25 07:13:01.896 [info] Syncing profile. testing
2024-06-25 07:13:01.899 [info] Settings (testing): No changes found during synchronizing settings.
2024-06-25 07:13:01.901 [info] Keybindings (testing): No changes found during synchronizing keybindings.
2024-06-25 07:13:01.903 [info] Snippets (testing): No changes found during synchronizing snippets.
2024-06-25 07:13:01.904 [info] Tasks (testing): No changes found during synchronizing tasks.
2024-06-25 07:13:01.907 [info] GlobalState (testing): No changes found during synchronizing ui state.
2024-06-25 07:13:01.918 [info] Extensions (testing): No changes found during synchronizing extensions.
2024-06-25 07:13:01.918 [info] Syncing profile. testing2
2024-06-25 07:13:01.921 [info] Settings (testing2): No changes found during synchronizing settings.
2024-06-25 07:13:01.924 [info] Keybindings (testing2): No changes found during synchronizing keybindings.
2024-06-25 07:13:01.925 [info] Snippets (testing2): No changes found during synchronizing snippets.
2024-06-25 07:13:01.926 [info] Tasks (testing2): No changes found during synchronizing tasks.
2024-06-25 07:13:01.929 [info] GlobalState (testing2): No changes found during synchronizing ui state.
2024-06-25 07:13:01.940 [info] Extensions (testing2): No changes found during synchronizing extensions.
2024-06-25 07:13:01.941 [info] Sync done. Took 2685ms
2024-06-25 07:13:10.165 [info] Auto Sync: Triggered by Activity
2024-06-25 07:13:10.166 [info] Sync started.
2024-06-25 07:13:10.200 [info] Settings: Skipped synchronizing settings as there are conflicts.
2024-06-25 07:13:10.200 [info] Keybindings: Last sync resource does not exist locally.
2024-06-25 07:13:10.242 [info] Keybindings: No changes found during synchronizing keybindings.
2024-06-25 07:13:10.242 [info] Snippets: Last sync resource does not exist locally.
2024-06-25 07:13:10.271 [info] Snippets: No changes found during synchronizing snippets.
2024-06-25 07:13:10.272 [info] Tasks: Last sync resource does not exist locally.
2024-06-25 07:13:10.302 [info] Tasks: No changes found during synchronizing tasks.
2024-06-25 07:13:10.400 [info] GlobalState: Updated remote ui state. Updated: workbench.statusbar.hidden.
2024-06-25 07:13:10.405 [info] GlobalState: Updated last synchronized ui state
2024-06-25 07:13:10.443 [info] Extensions: No changes found during synchronizing extensions.
2024-06-25 07:13:10.443 [info] Profiles: No changes found during synchronizing profiles.
2024-06-25 07:13:10.444 [info] Syncing profile. test
2024-06-25 07:13:10.450 [info] Settings (test): No changes found during synchronizing settings.
2024-06-25 07:13:10.451 [info] Keybindings (test): No changes found during synchronizing keybindings.
2024-06-25 07:13:10.452 [info] Snippets (test): No changes found during synchronizing snippets.
2024-06-25 07:13:10.454 [info] Tasks (test): No changes found during synchronizing tasks.
2024-06-25 07:13:10.455 [info] GlobalState (test): No changes found during synchronizing ui state.
2024-06-25 07:13:10.469 [info] Extensions (test): No changes found during synchronizing extensions.
2024-06-25 07:13:10.469 [info] Syncing profile. testing
2024-06-25 07:13:10.469 [info] Settings (testing): No changes found during synchronizing settings.
2024-06-25 07:13:10.470 [info] Keybindings (testing): No changes found during synchronizing keybindings.
2024-06-25 07:13:10.471 [info] Snippets (testing): No changes found during synchronizing snippets.
2024-06-25 07:13:10.472 [info] Tasks (testing): No changes found during synchronizing tasks.
2024-06-25 07:13:10.473 [info] GlobalState (testing): No changes found during synchronizing ui state.
2024-06-25 07:13:10.484 [info] Extensions (testing): No changes found during synchronizing extensions.
2024-06-25 07:13:10.485 [info] Syncing profile. testing2
2024-06-25 07:13:10.485 [info] Settings (testing2): No changes found during synchronizing settings.
2024-06-25 07:13:10.486 [info] Keybindings (testing2): No changes found during synchronizing keybindings.
2024-06-25 07:13:10.487 [info] Snippets (testing2): No changes found during synchronizing snippets.
2024-06-25 07:13:10.488 [info] Tasks (testing2): No changes found during synchronizing tasks.
2024-06-25 07:13:10.489 [info] GlobalState (testing2): No changes found during synchronizing ui state.
2024-06-25 07:13:10.499 [info] Extensions (testing2): No changes found during synchronizing extensions.
2024-06-25 07:13:10.500 [info] Sync done. Took 334ms
2024-06-25 07:13:17.287 [info] Auto Sync: Triggered by Activity
2024-06-25 07:13:17.287 [info] Sync started.
2024-06-25 07:13:17.310 [info] Settings: Skipped synchronizing settings as there are conflicts.
2024-06-25 07:13:17.313 [info] Keybindings: No changes found during synchronizing keybindings.
2024-06-25 07:13:17.316 [info] Snippets: No changes found during synchronizing snippets.
2024-06-25 07:13:17.317 [info] Tasks: No changes found during synchronizing tasks.
2024-06-25 07:13:17.413 [info] GlobalState: Updated remote ui state. Updated: workbench.statusbar.hidden.
2024-06-25 07:13:17.419 [info] GlobalState: Updated last synchronized ui state
2024-06-25 07:13:17.459 [info] Extensions: No changes found during synchronizing extensions.
2024-06-25 07:13:17.460 [info] Profiles: No changes found during synchronizing profiles.
2024-06-25 07:13:17.460 [info] Syncing profile. test
2024-06-25 07:13:17.461 [info] Settings (test): No changes found during synchronizing settings.
2024-06-25 07:13:17.463 [info] Keybindings (test): No changes found during synchronizing keybindings.
2024-06-25 07:13:17.465 [info] Snippets (test): No changes found during synchronizing snippets.
2024-06-25 07:13:17.466 [info] Tasks (test): No changes found during synchronizing tasks.
2024-06-25 07:13:17.466 [info] GlobalState (test): No changes found during synchronizing ui state.
2024-06-25 07:13:17.478 [info] Extensions (test): No changes found during synchronizing extensions.
2024-06-25 07:13:17.478 [info] Syncing profile. testing
2024-06-25 07:13:17.479 [info] Settings (testing): No changes found during synchronizing settings.
2024-06-25 07:13:17.480 [info] Keybindings (testing): No changes found during synchronizing keybindings.
2024-06-25 07:13:17.480 [info] Snippets (testing): No changes found during synchronizing snippets.
2024-06-25 07:13:17.481 [info] Tasks (testing): No changes found during synchronizing tasks.
2024-06-25 07:13:17.482 [info] GlobalState (testing): No changes found during synchronizing ui state.
2024-06-25 07:13:17.493 [info] Extensions (testing): No changes found during synchronizing extensions.
2024-06-25 07:13:17.493 [info] Syncing profile. testing2
2024-06-25 07:13:17.494 [info] Settings (testing2): No changes found during synchronizing settings.
2024-06-25 07:13:17.495 [info] Keybindings (testing2): No changes found during synchronizing keybindings.
2024-06-25 07:13:17.495 [info] Snippets (testing2): No changes found during synchronizing snippets.
2024-06-25 07:13:17.496 [info] Tasks (testing2): No changes found during synchronizing tasks.
2024-06-25 07:13:17.496 [info] GlobalState (testing2): No changes found during synchronizing ui state.
2024-06-25 07:13:17.507 [info] Extensions (testing2): No changes found during synchronizing extensions.
2024-06-25 07:13:17.508 [info] Sync done. Took 222ms
2024-06-25 07:13:43.654 [info] Auto Sync: Triggered by Activity
2024-06-25 07:13:43.654 [info] Sync started.
2024-06-25 07:13:43.685 [info] Settings: Skipped synchronizing settings as there are conflicts.
2024-06-25 07:13:43.687 [info] Keybindings: No changes found during synchronizing keybindings.
2024-06-25 07:13:43.691 [info] Snippets: No changes found during synchronizing snippets.
2024-06-25 07:13:43.697 [info] Tasks: No changes found during synchronizing tasks.
2024-06-25 07:13:43.698 [info] GlobalState: No changes found during synchronizing ui state.
2024-06-25 07:13:43.743 [info] Extensions: No changes found during synchronizing extensions.
2024-06-25 07:13:43.743 [info] Profiles: No changes found during synchronizing profiles.
2024-06-25 07:13:43.743 [info] Syncing profile. test
2024-06-25 07:13:43.744 [info] Settings (test): No changes found during synchronizing settings.
2024-06-25 07:13:43.746 [info] Keybindings (test): No changes found during synchronizing keybindings.
2024-06-25 07:13:43.747 [info] Snippets (test): No changes found during synchronizing snippets.
2024-06-25 07:13:43.748 [info] Tasks (test): No changes found during synchronizing tasks.
2024-06-25 07:13:43.749 [info] GlobalState (test): No changes found during synchronizing ui state.
2024-06-25 07:13:43.762 [info] Extensions (test): No changes found during synchronizing extensions.
2024-06-25 07:13:43.762 [info] Syncing profile. testing
2024-06-25 07:13:43.763 [info] Settings (testing): No changes found during synchronizing settings.
2024-06-25 07:13:43.764 [info] Keybindings (testing): No changes found during synchronizing keybindings.
2024-06-25 07:13:43.765 [info] Snippets (testing): No changes found during synchronizing snippets.
2024-06-25 07:13:43.766 [info] Tasks (testing): No changes found during synchronizing tasks.
2024-06-25 07:13:43.767 [info] GlobalState (testing): No changes found during synchronizing ui state.
2024-06-25 07:13:43.777 [info] Extensions (testing): No changes found during synchronizing extensions.
2024-06-25 07:13:43.777 [info] Syncing profile. testing2
2024-06-25 07:13:43.778 [info] Settings (testing2): No changes found during synchronizing settings.
2024-06-25 07:13:43.779 [info] Keybindings (testing2): No changes found during synchronizing keybindings.
2024-06-25 07:13:43.781 [info] Snippets (testing2): No changes found during synchronizing snippets.
2024-06-25 07:13:43.782 [info] Tasks (testing2): No changes found during synchronizing tasks.
2024-06-25 07:13:43.784 [info] GlobalState (testing2): No changes found during synchronizing ui state.
2024-06-25 07:13:43.805 [info] Extensions (testing2): No changes found during synchronizing extensions.
2024-06-25 07:13:43.805 [info] Sync done. Took 152ms
2024-06-25 07:14:28.226 [info] Auto Sync: Triggered by Activity
2024-06-25 07:14:28.226 [info] Sync started.
2024-06-25 07:14:28.283 [info] Settings: Skipped synchronizing settings as there are conflicts.
2024-06-25 07:14:28.286 [info] Keybindings: No changes found during synchronizing keybindings.
2024-06-25 07:14:28.289 [info] Snippets: No changes found during synchronizing snippets.
2024-06-25 07:14:28.290 [info] Tasks: No changes found during synchronizing tasks.
2024-06-25 07:14:28.292 [info] GlobalState: No changes found during synchronizing ui state.
2024-06-25 07:14:28.330 [info] Extensions: No changes found during synchronizing extensions.
2024-06-25 07:14:28.331 [info] Profiles: No changes found during synchronizing profiles.
2024-06-25 07:14:28.331 [info] Syncing profile. test
2024-06-25 07:14:28.333 [info] Settings (test): No changes found during synchronizing settings.
2024-06-25 07:14:28.335 [info] Keybindings (test): No changes found during synchronizing keybindings.
2024-06-25 07:14:28.335 [info] Snippets (test): No changes found during synchronizing snippets.
2024-06-25 07:14:28.336 [info] Tasks (test): No changes found during synchronizing tasks.
2024-06-25 07:14:28.337 [info] GlobalState (test): No changes found during synchronizing ui state.
2024-06-25 07:14:28.351 [info] Extensions (test): No changes found during synchronizing extensions.
2024-06-25 07:14:28.351 [info] Syncing profile. testing
2024-06-25 07:14:28.352 [info] Settings (testing): No changes found during synchronizing settings.
2024-06-25 07:14:28.353 [info] Keybindings (testing): No changes found during synchronizing keybindings.
2024-06-25 07:14:28.353 [info] Snippets (testing): No changes found during synchronizing snippets.
2024-06-25 07:14:28.354 [info] Tasks (testing): No changes found during synchronizing tasks.
2024-06-25 07:14:28.355 [info] GlobalState (testing): No changes found during synchronizing ui state.
2024-06-25 07:14:28.366 [info] Extensions (testing): No changes found during synchronizing extensions.
2024-06-25 07:14:28.366 [info] Syncing profile. testing2
2024-06-25 07:14:28.367 [info] Settings (testing2): No changes found during synchronizing settings.
2024-06-25 07:14:28.368 [info] Keybindings (testing2): No changes found during synchronizing keybindings.
2024-06-25 07:14:28.368 [info] Snippets (testing2): No changes found during synchronizing snippets.
2024-06-25 07:14:28.369 [info] Tasks (testing2): No changes found during synchronizing tasks.
2024-06-25 07:14:28.374 [info] GlobalState (testing2): No changes found during synchronizing ui state.
2024-06-25 07:14:28.386 [info] Extensions (testing2): No changes found during synchronizing extensions.
2024-06-25 07:14:28.395 [info] Sync done. Took 161ms

Restarting to update seems to have fixed the problem, so it's possible this is fixed already.
@sandy081 sandy081 added bug Issue identified by VS Code Team member as probable bug settings-sync labels Jun 25, 2024
@sandy081 sandy081 modified the milestones: June 2024, July 2024 Jun 25, 2024
@sandy081
Copy link
Member

sandy081 commented Jul 4, 2024

There is a bug in clean up

2024-06-25 07:13:01.533 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/extensions
2024-06-25 07:13:01.539 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/globalState
2024-06-25 07:13:01.556 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/keybindings
2024-06-25 07:13:01.560 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/profiles
2024-06-25 07:13:01.566 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/settings
2024-06-25 07:13:01.569 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/snippets
2024-06-25 07:13:01.593 [info] Deleting non existing profile from backup /Users/tyriar/Library/Application Support/Code - Insiders/User/sync/tasks

These should not be cleaned up. These are sync specific folders for default profile. This is where conflicts related data (preview file) is stored. Clean up is deleting this file and therefore you are seeing this error.

sandy081 added a commit that referenced this issue Jul 4, 2024
@sandy081
fix #218061
8f4a44c
@sandy081 sandy081 mentioned this issue Jul 4, 2024
Merged
@VSCodeTriageBot VSCodeTriageBot added the unreleased Patch has not yet been released in VS Code Insiders label Jul 4, 2024
@VSCodeTriageBot VSCodeTriageBot added insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Jul 5, 2024
aaronchucarroll pushed a commit to aaronchucarroll/vscode that referenced this issue Jul 10, 2024
@sandy081 @aaronchucarroll
fix microsoft#218061 (microsoft#219936)
5d073de
@connor4312 connor4312 added the verified Verification succeeded label Jul 25, 2024
@vs-code-engineering vs-code-engineering bot locked and limited conversation to collaborators Aug 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@sandy081 sandy081

Labels
bug Issue identified by VS Code Team member as probable bug insiders-released Patch has been released in VS Code Insiders settings-sync verified Verification succeeded
Projects
None yet
Milestone
July 2024
Development

Successfully merging a pull request may close this issue.

fix #218061 microsoft/vscode
4 participants
@Tyriar @connor4312 @sandy081 @VSCodeTriageBot