Skip to content
Snippets Groups Projects
Commit 55f3bf8b authored by Doug's avatar Doug
Browse files

Fix rebase take II.

parent 582551ff
Branches
Tags
No related merge requests found
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment