Conflict Resolution in a Bidirectional Sync App — How I Handle the Hard Cases

All tests run on an 8-year-old MacBook Air. All results from shipping 7 Mac apps as a solo developer....

venerdì 19 giugno 2026 New tab

442 words~2 min read

All tests run on an 8-year-old MacBook Air. All results from shipping 7 Mac apps as a solo developer. No sponsored opinion.

HiyokoAutoSync does bidirectional sync between Android and Mac. Bidirectional sync has a hard problem: what happens when the same file is modified on both sides? Here's how I handle it.

The conflict cases

File modified on both sides since last sync — which version wins?

File deleted on one side, modified on the other — delete or keep?

Conflict Resolution in a Bidirectional Sync App — How I Handle the Hard Cases

Conflict Resolution in a Bidirectional Sync App — How I Handle the Hard Cases

Related reading

Parallel File Transfers in Rust — How I Made Android Sync Actually Fast

Smart Resume for File Transfers in Rust — Never Start Over

Why I Built my Own Suite of Android Tools for macOS in Rust

MTP File Transfer in Rust on macOS — Why I Wrote My Own Stack

I Built a Feature That Automatically Switches Android from USB to Wi-Fi —…

Wi-Fi ADB Lies to You: The Silent Disconnect Problem No One Talks About

Related reading

Parallel File Transfers in Rust — How I Made Android Sync Actually Fast

Smart Resume for File Transfers in Rust — Never Start Over

Why I Built my Own Suite of Android Tools for macOS in Rust

MTP File Transfer in Rust on macOS — Why I Wrote My Own Stack

I Built a Feature That Automatically Switches Android from USB to Wi-Fi —…

Wi-Fi ADB Lies to You: The Silent Disconnect Problem No One Talks About