Skip to content

Commit 900d19c

Browse files
committed
Fetch a bit more history, so the merge from master will not fail.
1 parent c20cf52 commit 900d19c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242

4343
- name: Merge back to develop
4444
run: |
45-
git fetch --depth 1 origin develop
45+
git fetch --depth 2 origin develop
4646
git checkout develop
47-
git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
47+
git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
4848
git merge master --no-edit
4949
git push origin develop

0 commit comments

Comments
 (0)