These are chat archives for atom-community/sync-settings

15th
Jul 2015
Nelson Martell
@nelson6e65
Jul 15 2015 22:21
Sorry by disturbing... I just came to said...
I love it! :heart_eyes:
Nelson Martell
@nelson6e65
Jul 15 2015 22:56
If I change the same setting in 2 instances (one in Windows and another in Linux), at the same time, and I sent backup, this package will provide a way to solve conflicts?
Tim
@timfallmk
Jul 15 2015 22:58
atom-sync-settings uses gists to store info. I don't think there's support for merging and conflict resolution upstream, it generally just overwrites with the latest push