Skip to content

Commit 6affc2b

Browse files
fix: use fetch-depth 0 and rebase -s ours to avoid shallow clone conflicts
Signed-off-by: souravbiswassanto <saurov@appscode.com>
1 parent f7f40d4 commit 6affc2b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/refresh-library.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1919
with:
2020
persist-credentials: false
21+
fetch-depth: 0
2122

2223
- name: Set up Go
2324
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
@@ -66,6 +67,6 @@ jobs:
6667
if [[ $(git status --porcelain) ]]; then
6768
git commit -s -a -m "update libary $(date --rfc-3339=date)"
6869
git fetch origin
69-
git pull --rebase origin master
70+
git pull --rebase -s ours origin master
7071
git push origin HEAD
7172
fi

0 commit comments

Comments
 (0)