Fix rebase take II.

This commit is contained in:
Doug
2025-03-21 10:11:56 +00:00
parent 4afb98941c
commit 41072de1bc

View File

@@ -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}")