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

Fix rebase take II.

Browse Source
This commit is contained in:
Doug
2025-03-21 10:11:56 +00:00
parent 582551ffbf
commit 55f3bf8b62
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlane/Fastfile
+1 -1
View File
@@ -291,7 +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 reset --hard")
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}")