Skip to content

Commit 3d204ff

Browse files
committed
Fetch some more history to be able to merge
1 parent 246c8fe commit 3d204ff

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/publish.yml

+3-3
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 2 origin develop
48-
git checkout develop
49-
git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
47+
git fetch --depth 10 origin develop
48+
git switch develop
49+
git fetch --shallow-since="$(git show -s --format=%ci develop~2)" origin master develop
5050
git merge master --no-edit
5151
git push origin develop

0 commit comments

Comments
 (0)