# Pin how Save of a placement edit merges by field · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/b8c3f3026ca7b743d986980a73ca24743a8c3fec)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: b8c3f3026ca7b743d986980a73ca24743a8c3fec

Requested commit: b8c3f3026ca7b743d986980a73ca24743a8c3fec

Commit: b8c3f3026ca7b743d986980a73ca24743a8c3fec

Tree: 289e3c0ccf8078413521d345971c1e2d26aa6618

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Pin how Save of a placement edit merges by field

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>

```

## Parents

- [e314496a10e3761a3191a44f27c771a66840d431](https://git.cafe/dara/icarus/commit/e314496a10e3761a3191a44f27c771a66840d431?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/b8c3f3026ca7b743d986980a73ca24743a8c3fec?format=markdown)