diff --git a/.github/workflows/py_autofix.yml b/.github/workflows/py_autofix.yml index 422133f76c..afc19ee03a 100644 --- a/.github/workflows/py_autofix.yml +++ b/.github/workflows/py_autofix.yml @@ -70,6 +70,7 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" + git fetch origin ${{ github.base_ref }} git merge origin/${{ github.base_ref }} --no-edit || { # Check which files have conflicts CONFLICTED=$(git diff --name-only --diff-filter=U)