How are conflicts handled?
Let's say I have two devices; both are offline. Now when I make changes to the same file on both devices, what happens when both devices come online? I guess there will be data loss?
Let's say I have two devices; both are offline. Now when I make changes to the same file on both devices, what happens when both devices come online? I guess there will be data loss?
In the future, I'd like to integrate git into the application and have a simplified conflict resolution where a a diff would be shown and you're given a accept this version or this other version.