Directory sync skips the merge entirely when local and remote already match.
What's wrong with this entry?
Syncing a directory now reads the three git snapshots it compares in one go and, when the local and remote trees are identical, produces a clean result without running a merge at all.
- Failure to read the snapshots now reports "could not read the HEAD or laptop snapshot trees" instead of naming a single tree.
- A merge-base failure returns a structured git error saying "could not wrap the merge base" rather than aborting the whole sync plan.
could not read the HEAD or laptop snapshot trees
Strings lifted out of the shipped bundle, so the claim above can be checked against them.
Related
Other releases about the same thing. Found by shared names or similar wording; neither means one caused the other.
-
v2.1.238
Sync state machine gains a moved-root case and a per-turn pull hook
Both mention directory
-
v2.1.238
Untracked-file survey extracted and shared
Both mention directory
-
v2.1.238
Sync internals reshaped around per-file credential state
Both mention directory