Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

#91545 skip global state synchroniser while checking for merging

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-03-30 18:15:12 +02:00
parent 54def40726
commit 2e601022fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/userDataSync/common/userDataSyncService.ts
+1 -1
View File
@@ -220,7 +220,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
if (!(await this.hasLocalData())) {
return false;
}
for (const synchroniser of this.synchronisers) {
for (const synchroniser of [this.settingsSynchroniser, this.keybindingsSynchroniser, this.snippetsSynchroniser, this.extensionsSynchroniser]) {
const preview = await synchroniser.getSyncPreview();
if (preview.hasLocalChanged || preview.hasRemoteChanged) {
return true;