Provide a way to access conflicting settings

[sandy081]

Provide a way to access conflicting settings so that they can be shown in Settings Editor.

It is needed for #84431

[sandy081]

Implemented ISettingsSyncService that can provide the state of settings sync and also can access conflicts and resolve them

vscode/src/vs/platform/userDataSync/common/userDataSync.ts

Lines 201 to 206 in f14dd3f

	export interface ISettingsSyncService extends ISynchroniser {
	_serviceBrand: any;
	getConflicts(): Promise<IConflictSetting[]>;
	resolveConflicts(resolvedConflicts: { key: string, value: any | undefined }[]): Promise<void>;
	}

[sandy081]

Changed the API

vscode/src/vs/platform/userDataSync/common/userDataSync.ts

Lines 201 to 206 in cd4472e

	export interface ISettingsSyncService extends ISynchroniser {
	_serviceBrand: any;
	readonly onDidChangeConflicts: Event<IConflictSetting[]>;
	readonly conflicts: IConflictSetting[];
	resolveConflicts(resolvedConflicts: { key: string, value: any | undefined }[]): Promise<void>;
	}