Skip to content
Snippets Groups Projects
Unverified Commit 8cb5330e authored by Doug's avatar Doug Committed by GitHub
Browse files

Discard any changes before rebasing main. (#3927)

parent 42ff9b7e
No related branches found
No related tags found
No related merge requests found
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment