171
172
protected async getMergeResult(resourcePreview: IGlobalStateResourcePreview, token: CancellationToken): Promise<IMergeResult> {
173
>
return { ...resourcePreview.previewResult, hasConflicts: false };
globalStateSync.ts
174
>
}
175
176
protected async getAcceptResult(resourcePreview: IGlobalStateResourcePreview, resource: URI, content: string | null | undefined, token: CancellationToken): Promise<IGlobalStateResourceMergeResult> {
178
>
/* Accept local resource */
179
>
if (this.extUri.isEqual(resource, this.localResource)) {
180
return this.acceptLocal(resourcePreview);
181
}
183
>
/* Accept remote resource */
184
>
if (this.extUri.isEqual(resource, this.remoteResource)) {
185
return this.acceptRemote(resourcePreview);
186
}
188
>
/* Accept preview resource */
189
>
if (this.extUri.isEqual(resource, this.previewResource)) {
190
>
return resourcePreview.previewResult;
191
>
}
192
193
throw new Error(`Invalid Resource: ${resource.toString()}`);
195
196
private async acceptLocal(resourcePreview: IGlobalStateResourcePreview): Promise<IGlobalStateResourceMergeResult> {