From a77838bb982ecb41d3f95b1365ea81c511e6940d Mon Sep 17 00:00:00 2001 From: "Agani Daniel .S" <33962088+StrongTheDev@users.noreply.github.com> Date: Mon, 20 Jul 2026 09:58:37 +0300 Subject: [PATCH] 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 --- crates/workspace/src/pane.rs | 2 +- crates/workspace/src/workspace.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 837afb6183..e8e70de796 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -2344,7 +2344,7 @@ impl Pane { PromptLevel::Warning, CONFLICT_MESSAGE, None, - &["Overwrite", "Discard", "Cancel"], + &["Overwrite", "Discard Edits", "Cancel"], cx, ) })?; diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 9e89a46ac6..cdfbcb78a3 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -12410,7 +12410,7 @@ mod tests { assert!(cx.has_pending_prompt()); // Cancel saving item 3. - cx.simulate_prompt_answer("Discard"); + cx.simulate_prompt_answer("Discard Edits"); cx.executor().run_until_parked(); // Item 3 is reloaded. There's a prompt to save item 4.