Update sync.yml

Signed-off-by: VetheonGames <[email protected]>
PixelRidge-Softworks · Jun 28, 2024 · 8e5e1e5 · 8e5e1e5
1 parent 2f1122a
commit 8e5e1e5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -32,7 +32,11 @@ jobs:
         git checkout master
         git merge upstream/master --strategy-option theirs --no-commit
         git restore --source=HEAD --staged README.md .github/
-        git commit -m "Merge upstream changes"
+        if git diff-index --quiet HEAD; then
+          echo "No changes to commit"
+        else
+          git commit -m "Merge upstream changes"
+        fi
 
     - name: Push Changes
       run: git push origin master