Sergey Pak d42948bac0 IDEA-341528 Settings Sync History: collect statistics about merging with conflict - record conflicting file type (plugins.json, options, scheme) ...

(cherry picked from commit 666a133428d3b4ca296d13df7d3579de69f93f5a)

GitOrigin-RevId: 82b75bc0d567666eb62d19e907e78e83b932f2ae

2024-01-18 00:24:19 +00:00

..

git

[settings-sync] remove unnecessary table field

2024-01-16 00:47:14 +00:00

resources

settings-sync: fix Troubleshooting dialog error message typo

2024-01-05 20:50:39 +00:00

src

IDEA-341528 Settings Sync History: collect statistics about merging with conflict - record conflicting file type (plugins.json, options, scheme)

2024-01-18 00:24:19 +00:00

test-resources

…

tests/com/intellij/settingsSync

IDEA-339070: handle RoamingType.LOCAL and preparing for migratable components in other.xml

2023-12-21 10:27:35 +00:00

intellij.settingsSync.iml

…