Skip to content

Commit 55f3bf8

Browse files
committed
Fix rebase take II.
1 parent 582551f commit 55f3bf8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def rebase_main_onto_current_branch
291291
UI.message("Current branch: #{current_branch}")
292292

293293
# Switch to main and update it
294-
sh("git checkout -- .")
294+
sh("git reset --hard")
295295
sh("git checkout main")
296296
sh("git pull origin main")
297297
sh("git rebase #{current_branch}")

0 commit comments

Comments
 (0)