diff --git a/.github/workflows/ci-lint-validate-convert.yml b/.github/workflows/ci-lint-validate-convert.yml index 3942c101..d0673db0 100644 --- a/.github/workflows/ci-lint-validate-convert.yml +++ b/.github/workflows/ci-lint-validate-convert.yml @@ -108,7 +108,9 @@ jobs: uses: actions/checkout@v2 - name: Fetch latest changes - run: git pull --rebase origin main + run: | + git fetch origin main + git merge origin/main - name: Set up Python uses: actions/setup-python@v2