From 8cb5330ee2cf4fe457907659ffe83eb1ad65eab8 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 20 Mar 2025 18:05:43 +0000 Subject: [PATCH] Discard any changes before rebasing main. (#3927) --- fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 21c1728c9..138932b40 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -291,6 +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 checkout main") sh("git pull origin main") sh("git rebase #{current_branch}") -- GitLab