[vageli]

How does this handle conflicting offline writes?

[thecodrr]

For most cases, the most recently edited copy is kept. However, if there's a conflict between 2 notes then a nice Git Conflict like UI is shown with both notes side by side and their differences highlighted.