vscode: Problem in settings sync

I see this is closed, and was claimed to have been resolved in a recent Insiders. I’m still running 1.51.1, and I see that my extensions weren’t actually stored, and my keyboard shortcuts haven’t been updated locally to match what was originally stored. In fact, the most recent sync shows it went the other way (local -> remote).

I thought there would be some way to indicate which way to manage a sync (restore to local, overwrite remote, etc), but I don’t see that if it’s available.

I also don’t see any way to (easily) update from an older sync. It opens up a diff viewer, but the local version is read-only and there’s no merge management, only a “view prev/next diff” navigation.

As there’s no easy way to pull settings from “machine 2” to “current machine”, it would also be useful if it was possible to change the machine id value without having to edit the state.vscdb meta-data and fields, vs wiping everything in the locally stored configuration (“make this machine now known as this older machine”).

Unfortunately, I don’t have the original install available – this was a new install over a wiped system. It took a lot of work to figure out where to find the right older machine id and set it properly. It would be useful to be able to see the machine id associated with synced machines.