Settings reordered by resolving conflicts

[roblourens]

Testing #91226

I set up sync in window A, set some settings, then set one setting in window B, enabled sync, and was confused by the conflict resolution diff.

Window A settings:

Window B settings, I just set one:

And I got a conflict resolution prompt as expected, and clicked the button to see the diff, which is confusing. I expect to just see the one fontSize setting on the right. Or, I expect to see the merged settings on the right with just the one fontSize setting in conflict. Instead it reordered autoSave and autoSaveDelay:

[sandy081]

Agree that this is confusing but can be explainable. Order of a setting is tried to retained while merging. It is retained by it's previous setting or by its next setting.

Since files.autoSave and files.autoSaveDelay are after editor.fontSize they are tried to place under it when merged. Order of editor.fontSize is retained in the local (machine B) as it is the file that is getting merged and hence it is respected.

[vscodebot]

The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our issue reporting guidelines.

Happy Coding!

[roblourens]

I see, I'm not sure how it could be improved but yeah it's confusing that the result doesn't really match either the local or the remote settings.