update sync fork workflow

yalla-coop · Jul 27, 2023 · 49bc28d · 49bc28d
1 parent eae2a58
commit 49bc28d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/sync_fork.yml b/.github/workflows/sync_fork.yml
@@ -22,5 +22,7 @@ jobs:
           git config --global user.name "Sync Fork"
           git checkout main
           git merge --allow-unrelated-histories -X theirs upstream/main -m "Merge upstream changes"
-
+          git reset --soft HEAD~1
+          git restore --staged .github
+          git commit -m "Merge upstream changes"
           git push origin main