# Resolve a conflict item by item, not by reloading the page · dara/icarus

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

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

Visibility: public

Requested revision: deae14e199ccf9bbbea0d454c51942b7e614ca96

Requested commit: deae14e199ccf9bbbea0d454c51942b7e614ca96

Commit: deae14e199ccf9bbbea0d454c51942b7e614ca96

Tree: 4a18866ce2f1c6993b409794112b59609f7b777c

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Resolve a conflict item by item, not by reloading the page

Use cloud and Keep both reloaded the whole page to show the cloud's
version, which closed Edit placement and threw away its drags even when
the conflict was on another lineup. Teammates' changes already apply item
by item (#208); conflict resolution now goes the same way, holding what
the user has open except what they chose the cloud's version of. A
placement edit of a lineup in the conflict ends.

This replaces the earlier commits' reopen-after-reload logic in the lineup
provider and editor, which go back to #265's versions.

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

```

## Parents

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

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