Skip to content

Settings Sync - Do not show conflicts instead merge them smartly #161958

Open

Description

Testing #161785

Can't we just open each profile file that is under conflict as an editor? And once all the conflicts are fixed we continue?
Majority of the time it will just be one Profile under conflict. I strongly recommend that we treat that case the same way we do if settings sync has a conflict.

I do not think this corner case of multiple profiles being in conflict deserves a special UI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Assignees

Labels

Type

No type

Projects

No projects

Relationships

None yet

Development

No branches or pull requests

Issue actions