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", "."