203
/* Prompts added remotely -> add locally */
204
for (const key of Object.keys(mergeResult.local.added)) {
206
>
content: mergeResult.local.added[key],
207
>
hasConflicts: false,
208
>
localChange: Change.Added,
209
>
remoteChange: Change.None,
210
>
};
211
>
resourcePreviews.set(key, {
212
>
baseResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'base' }),
213
>
baseContent: null,
214
>
fileContent: null,
215
>
localResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'local' }),
216
>
localContent: null,
217
>
remoteResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'remote' }),
218
>
remoteContent: remote[key],
219
>
previewResource: this.extUri.joinPath(this.syncPreviewFolder, key),
220
>
previewResult,
221
>
localChange: previewResult.localChange,
222
>
remoteChange: previewResult.remoteChange,
223
>
acceptedResource: this.extUri.joinPath(this.syncPreviewFolder, key).with({ scheme: USER_DATA_SYNC_SCHEME, authority: 'accepted' })
224
>
});
225
>
}
226
227
/* Prompts updated remotely -> update locally */