Handle automatically all settings sync conflicts (BlueOS vs Cockpit)

[rafaellehmkuhl]

This PR removes completely removes the need for the user to solve sync conflicts. All of those are now solved automatically based on change-timestamps.

With it, we always preserve the most recent change, considering of course that this change belongs to the same user and vehicle.

If one performs changes while disconnected, the changes will be preserved and pushed to the vehicle in the next boot as long as the user connects to the same vehicle as it was previously, otherwise we pull the changes from the new vehicle.

For the reviewers: this patch changes a sensitive pipeline of Cockpit, so it's important that all reviewing test the functionality as well. The tests that should be performed consist on changing vehicles and users. Settings should always be kept in sync with the same user/vehicle combination.

There should be only one situation (user connected to vehicle 1 > user disconnects > user makes changes to their settings > user connects to vehicle 2) where someone changing their settings while offline loses those changes. I've opened issue #1686 to handle that as well, but it's a more rare edge-case and depends on some changes I would prefer not doing now so I don't mess with the changes being done on #1685.

Fix #1627
Fix #1628

Closes all of those related to solving conflicts as well, as we don't have conflicts to deal with anymore.

Fix #1120
Fix #1383
Fix #1626

[ArturoManzoli]

Nice approach to the configs priority!
No conflicts showed up

- On Cockpit Web -
While testing the persistence of the setup changes, I started with a fresh run of the Cockpit, with default settings, no user or vehicle configured.

I created a new user, changed the glass color and then connected to the vehicle;
The user was saved on the vehicle, as it should be but the glass color didn't persist after the connection and the restarts;

Also, I had some trouble with cockpit hanging after connected to the vehicle. I'll try to post the console log.
When opening the general settings to change the user after connecting and restarting, the user selection dialog didn't show up; Then after a new boot, cockpit hung after opening the main menu; Then , on the third restart Cockpit behaved normally.

Will do the same test later on Electron.

Screenshare.-.2025-02-11.7_16_34.PM.mp4

[ArturoManzoli]

Here is the problem mentioned above with the console log

Screenshare.-.2025-02-11.7_29_54.PM.mp4

[ArturoManzoli]

Also checked on master and Cockpit doesn't have the same issue over there

[ES-Alexander]

Closes #1674 as well as we don't have conflicts to deal with anymore.

@rafaellehmkuhl This seems like an incorrect link.

Did you mean #1120, #1383, #1626 or something else?

[rafaellehmkuhl]

Closes #1674 as well as we don't have conflicts to deal with anymore.

@rafaellehmkuhl This seems like an incorrect link.

Did you mean #1120, #1383, #1626 or something else?

The point is that there will be no more conflicts to solve, so all of those will be closed as well. #1674 as well as the ones you mentioned. Will add them to the PR description.