diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6ca5e4a..54db8ae 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,8 +42,8 @@ jobs: - name: Merge back to develop run: | - git fetch --depth 1 origin develop + git fetch --depth 2 origin develop git checkout develop - git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop + git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop git merge master --no-edit git push origin develop