165
166
protected async hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean> {
167
>
const lastSyncContent = this.getKeybindingsContentFromLastSyncUserData(lastSyncUserData);
keybindingsSync.ts
168
>
if (lastSyncContent === null) {
169
return true;
170
}
172
>
const fileContent = await this.getLocalFileContent();
173
>
const localContent: string = fileContent ? fileContent.value.toString() : '';
174
>
const formattingOptions = await this.getFormattingOptions();
175
>
const result = await merge(localContent || '[]', lastSyncContent, lastSyncContent, formattingOptions, this.userDataSyncUtilService);
176
>
return result.hasConflicts || result.mergeContent !== lastSyncContent;
177
>
}
178
179
protected async getMergeResult(resourcePreview: IKeybindingsResourcePreview, token: CancellationToken): Promise<IMergeResult> {