From 491e7a34290fb10e226d239d1224e6308e7da094 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Tue, 30 Jan 2024 11:41:15 -0700
Subject: [PATCH] DEV: Don't create backups during version bumps (#25484)

---
 lib/tasks/version_bump.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/version_bump.rake b/lib/tasks/version_bump.rake
index 6a9aa8b24dc..8ce4715c6fe 100644
--- a/lib/tasks/version_bump.rake
+++ b/lib/tasks/version_bump.rake
@@ -340,7 +340,8 @@ task "version_bump:major_stable_merge", [:version_bump_ref] do |t, args|
 
     git "merge", "--no-commit", merge_ref, allow_failure: true
 
-    out, status = Open3.capture2e "git diff --binary #{merge_ref} | patch -p1 -R"
+    out, status =
+      Open3.capture2e "git diff --binary #{merge_ref} | patch -p1 -R --no-backup-if-mismatch"
     raise "Error applying diff\n#{out}}" unless status.success?
 
     git "add", "."