123
124
protected async hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean> {
125
>
const lastSyncContent: string | null = lastSyncUserData?.syncData ? this.getContentFromSyncContent(lastSyncUserData.syncData.content) : null;
abstractJsonSynchronizer.ts
126
>
if (lastSyncContent === null) {
127
return true;
128
}
130
>
const fileContent = await this.getLocalFileContent();
131
>
const localContent = fileContent ? fileContent.value.toString() : null;
132
>
const result = this.merge(localContent, lastSyncContent, lastSyncContent);
133
>
return result.hasLocalChanged || result.hasRemoteChanged;
134
>
}
135
136
protected async getMergeResult(resourcePreview: IJsonResourcePreview, token: CancellationToken): Promise<IMergeResult> {