From f83c73bd533fb5399726e2c44659df65a2509bb3 Mon Sep 17 00:00:00 2001 From: Taliesin Sisson Date: Wed, 27 Dec 2023 01:41:49 +0000 Subject: [PATCH] rebase pull --- .github/workflows/create-release.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 13a69071..6213e5e0 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -48,3 +48,4 @@ jobs: default_author: github_actions message: "chore(release): v${{ steps.get_version.outputs.RELEASE_VERSION }}" add: "CHANGELOG.md" + pull: '--rebase' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41165dd5..283e638a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -351,3 +351,4 @@ jobs: message: "chore(release): v${{ steps.get_version.outputs.PRERELEASE_VERSION }}" add: "CHANGELOG.md" new_branch: "v${{ steps.get_version.outputs.PRERELEASE_VERSION }}" + pull: '--rebase'