Discard any changes before rebasing main. (#3927)
This commit is contained in:
@@ -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}")
|
||||
|
||||
Reference in New Issue
Block a user