提交 2e601022 编写于 作者: S Sandeep Somavarapu

#91545 skip global state synchroniser while checking for merging

上级 54def407
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册