From 5b7c8f0bd15986b7b999ba997f21d0ff8804bd95 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:08:37 -0600 Subject: [PATCH 1/2] Remove beta branch checkout beta branch --- beta/beta-branch.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 51ddec78..0aff5637 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,11 +29,9 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git checkout main - git merge --allow-unrelated-histories ${BRANCH} || true - git checkout --theirs . + git merge --allow-unrelated-histories main || true + git checkout --ours . git add . - 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 + git commit -am 'Merge ${BRANCH} with main' + git push -fu origin ${BRANCH} + gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH} From 3f13f8b9aeb85db6aa6c6d119e2a00e08258a2fd Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:12:28 -0600 Subject: [PATCH 2/2] Add beta branch origin/main --- 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 0aff5637..8a055e96 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,7 +29,7 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git merge --allow-unrelated-histories main || true + git merge --allow-unrelated-histories origin/main || true git checkout --ours . git add . git commit -am 'Merge ${BRANCH} with main'