Skip to content

Commit 68c39d3

Browse files
authored
Update sync-fork-once-daily.yaml
1 parent dc6738e commit 68c39d3

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/sync-fork-once-daily.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ jobs:
2020
git remote add upstream https://github.com/curl/curl.git
2121
git fetch upstream
2222
git checkout ${{ github.ref_name }}
23-
git merge upstream/${{ github.ref_name }}
23+
git merge --no-ff --no-commit upstream/${{ github.ref_name }}
24+
git reset HEAD .github/workflows
25+
git checkout -- .github/workflows
26+
git commit -m "Sync with upstream (excluding workflows)"
2427
git push origin ${{ github.ref_name }}

0 commit comments

Comments
 (0)