# workspace: Rename "Discard" to "Discard Edits" in file conflict prompt \(\#55870\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e

Requested commit: f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e

Commit: f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e

Tree: c7a2e998478c2252a33b87b78d1c0e7fee808387

Author: Agani Daniel \.S

Committer: GitHub

## Message

```
workspace: Rename "Discard" to "Discard Edits" in file conflict prompt (#55870)

When a file has unsaved edits and has also changed on disk, the conflict
prompt offered "Overwrite / Discard / Cancel". Both "Overwrite" and
"Discard" were directionally ambiguous, it wasn't clear whether the disk
contents or the buffer edits would be lost. "Discard Edits" makes it
explicit that the buffer edits are thrown away and the disk version is
reloaded.

Release Notes:

- Improved the file conflict prompt by renaming the "Discard" button to
"Discard Edits" to clarify that unsaved edits are discarded in favor of
the on-disk contents.

---------

Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
```

## Parents

- [3bd398582fa0974243d7d466fe6f505958a9ae35](https://git.cafe/gitcafe/zed/commit/3bd398582fa0974243d7d466fe6f505958a9ae35?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/f7d9ae33b5ce1debd2b5962aacc6f7641de2bb0e?format=markdown)