ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Discard any changes before rebasing main. (#3927)

Browse Source
This commit is contained in:
Doug
2025-03-20 18:05:43 +00:00
committed by GitHub
parent 42ff9b7eda
commit 8cb5330ee2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlane/Fastfile
+1
View File
@@ -291,6 +291,7 @@ def rebase_main_onto_current_branch
UI.message("Current branch: #{current_branch}") UI.message("Current branch: #{current_branch}")
# Switch to main and update it # Switch to main and update it
sh("git checkout -- .")
sh("git checkout main") sh("git checkout main")
sh("git pull origin main") sh("git pull origin main")
sh("git rebase #{current_branch}") sh("git rebase #{current_branch}")