Add merge

viperproject · Dec 26, 2024 · d4278eb · d4278eb
1 parent 2899cbf
commit d4278eb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/smt2.yml b/.github/workflows/smt2.yml
@@ -42,10 +42,11 @@ jobs:
           git config --global user.name "gh-action[bot]"
           git fetch origin smt2
           git checkout FETCH_HEAD -b smt2
-          git checkout main
           git fetch --unshallow --no-tags --prune --no-recurse-submodules
-          echo "[git update]"
+          git merge -X theirs main
+          git checkout main
+          echo "[git] Update and merge done"
           git symbolic-ref HEAD refs/heads/smt2
-          git add .
-          git commit -m "Update from main and rebuild \".smt2\" files"
+          git add -A
+          git diff-index --quiet HEAD || git commit -m "Update from main and rebuild \".smt2\" files"
           git push -u origin smt2