116
|| lastSyncContent !== remoteContent // Remote has forwarded
117
) {
118
>
this.logService.trace(`${this.syncResourceLogLabel}: Merging remote keybindings with local keybindings...`);
keybindingsSync.ts
119
>
const result = await merge(localContent, remoteContent, lastSyncContent, formattingOptions, this.userDataSyncUtilService);
120
>
// Sync only if there are changes
121
>
if (result.hasChanges) {
122
mergedContent = result.mergeContent;
123
hasConflicts = result.hasConflicts;