# Merge only an edit in place, and a place only when named · dara/icarus

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

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

Visibility: public

Requested revision: 50d7e35ec6dbefe4b3ddea5327c51a4b3851c11c

Requested commit: 50d7e35ec6dbefe4b3ddea5327c51a4b3851c11c

Commit: 50d7e35ec6dbefe4b3ddea5327c51a4b3851c11c

Tree: 4a962a9c3ff2397c2a5cde0f7158eed55cc4ca10

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Merge only an edit in place, and a place only when named

A merged patch always carries the row's sortIndex, so Keep mine can
restore a deleted item where the user has it, but moves there only when
its merge names @sortIndex: a teammate's restacking stands against an edit
that did not restack. A merge naming another page than the row's (a
teammate moved the element) is written whole and revision-checked, so the
move is not undone.

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

```

## Parents

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

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