dep ugrade action: add rebase to clean up

materialsproject · Nov 2, 2022 · 42608f1 · 42608f1
1 parent 23f366f
commit 42608f1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/upgrade-dependencies.yml b/.github/workflows/upgrade-dependencies.yml
@@ -55,6 +55,7 @@ jobs:
           run:
             git checkout -b auto-dependency-upgrades
             git branch -r | grep auto-dependency-upgrades- | xargs -I {} git merge {}
+            git rebase main
             git push -f origin auto-dependency-upgrades
             git branch -r | grep auto-dependency-upgrades- | cut -d/ -f2 | xargs -I {} git push origin :{}
         - name: Open pull request if needed