On a server that merges by field, Save names only the spots the user
dragged, measured from the version the edit started from: the user's
drag wins over a teammate's move of that spot, and the teammate's move
of another spot the edit held back stays. The test that Save waits as a
conflict now says it runs on a server that checks whole groups.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>