Merge pull request #482 from ncihtan/aditigopalan-patch-1

Update ci-lint-validate-convert.yml
ncihtan · Jan 15, 2025 · ec309f4 · ec309f4
2 parents 3bd4727 + d092f37
commit ec309f4
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