Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide a way to access conflicting settings #86681

Closed
sandy081 opened this issue Dec 10, 2019 · 2 comments
Closed

Provide a way to access conflicting settings #86681

sandy081 opened this issue Dec 10, 2019 · 2 comments

Comments

@sandy081
Copy link
Member

@sandy081 sandy081 commented Dec 10, 2019

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

It is needed for #84431

@sandy081

This comment has been minimized.

Copy link
Member Author

@sandy081 sandy081 commented Jan 8, 2020

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

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

sandy081 added a commit that referenced this issue Jan 9, 2020
@sandy081

This comment has been minimized.

Copy link
Member Author

@sandy081 sandy081 commented Jan 9, 2020

Changed the API

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.