From 41072de1bc377efc575113a11e363ae76762e23a Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 21 Mar 2025 10:11:56 +0000 Subject: [PATCH] Fix rebase take II. --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 138932b40..8c9f48181 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -291,7 +291,7 @@ def rebase_main_onto_current_branch UI.message("Current branch: #{current_branch}") # Switch to main and update it - sh("git checkout -- .") + sh("git reset --hard") sh("git checkout main") sh("git pull origin main") sh("git rebase #{current_branch}")