Discard any changes before rebasing main. (#3927)

This commit is contained in:
Doug
2025-03-20 18:05:43 +00:00
committed by GitHub
parent 3883ed4229
commit 3981a79829

View File

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