# Restore failed discards over holds; resume held-back changes after · dara/icarus

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

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

Visibility: public

Requested revision: eb4c0a16d2be47740f11855d8b2f93086a4bf1a0

Requested commit: eb4c0a16d2be47740f11855d8b2f93086a4bf1a0

Commit: eb4c0a16d2be47740f11855d8b2f93086a4bf1a0

Tree: e35cb5c846b1803bc7c1e9e76d6cfce8bd7a93d5

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Restore failed discards over holds; resume held-back changes after

When part of Use cloud's discard fails, the redraw that follows puts the
user's version back on every refused entity, held or not; holding one
kept the cloud's version on screen while the work still waited.

A teammate's change held back by a hold the user let go of during the
discard waited for a reapply that conflict resolution then cleared. It
now resumes once resolution ends.

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

```

## Parents

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

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