From 506652f0716acd967a80bbb03263a950864bdf76 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:23:21 -0600 Subject: [PATCH 1/2] Update title and pull main --- beta/beta-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 733aee43..3611cca1 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -25,5 +25,5 @@ jobs: env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | - echo test: ${GITHUB_REF} - gh pr create --title '${GITHUB_REF}' --body 'Beta branch' + git pull origin main --allow-unrelated-histories + gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch' From d9a8a7dd0d1f27980125dd0125dca378b69fbef6 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:37:55 -0600 Subject: [PATCH 2/2] Update pull merge flags --- beta/beta-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 3611cca1..50d4e1a0 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -25,5 +25,5 @@ jobs: env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | - git pull origin main --allow-unrelated-histories + git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch'