From b2472df0136a5019dfc96d7547c29bc47b9ea467 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 11:51:58 -0600 Subject: [PATCH 1/2] Add beta branch merge || true --- 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 dd1e62cd..bd2f5628 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -30,7 +30,7 @@ jobs: git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" git checkout main - git merge --allow-unrelated-histories ${BRANCH} + git merge --allow-unrelated-histories ${BRANCH} || true git checkout --theirs . git add . git commit From 2c1be9dc422b6b4f2635ae855a80580df2214e1f Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 11:55:00 -0600 Subject: [PATCH 2/2] Add beta branch commit message --- 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 bd2f5628..51ddec78 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -33,7 +33,7 @@ jobs: git merge --allow-unrelated-histories ${BRANCH} || true git checkout --theirs . git add . - git commit + git commit -am 'Merge ${BRANCH}' git checkout -b beta-branch git push -fu origin beta-branch gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch