Merge pull request #483 from ncihtan/main

merging to main
ncihtan · Jan 15, 2025 · ef83b33 · ef83b33
2 parents 54f4f3c + ec309f4
commit ef83b33
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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