The git-based directory sync engine now detects when a first upload or send is blocked by an unmerged git index held by someone else, and polls and waits for that condition to clear rather than immediately retrying or failing. It shows progress messages such as "waiting while ... it goes on as soon as that clears" during the wait.
Dir-sync git engine now waits out an unmerged git index instead of giving up
A first upload blocked by someone else's unmerged git index now waits for it to clear, with progress messages.
You'll noticeTier: how much it should matter to you
2Useful: my rating, 1 to 5
3Signal: worth watching, 1 to 5
Directory SyncArea: what it touches
Bug FixesKind: in v2.1.257,
Bug FixesSection of the release