Skip to content

Commit e4c093e

Browse files
committed
Fetch a bit more history, so the merge from master will not fail.
1 parent 70562bf commit e4c093e

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
@@ -44,8 +44,8 @@ jobs:
4444

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

0 commit comments

Comments
 (0)