From bb92d4f2f46620a554e60042d435a0d75a064870 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 11:11:22 -0600 Subject: [PATCH 1/3] Add beta branch merge allow unrelated histories --- 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 d4e125fe..69b7e2ba 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 ${BRANCH} + git merge --allow-unrelated-histories ${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 From 2fbbcae1137902870daef0762d157520c76d88fc Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 11:21:24 -0600 Subject: [PATCH 2/3] Add beta branch checkout theirs --- beta/beta-branch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 69b7e2ba..8c5eb22f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -31,6 +31,8 @@ jobs: git config user.email "wolfemikl@gmail.com" git checkout main git merge --allow-unrelated-histories ${BRANCH} + git checkout --theirs . + git add . git checkout -b beta-branch git push -fu origin beta-branch gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch From 2fb7a8e7801001770130850257562938c64d6133 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 11:24:56 -0600 Subject: [PATCH 3/3] Update beta compile test --- beta/beta-compile.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index fe9fa349..4f22cb48 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -26,10 +26,10 @@ jobs: run: | git checkout -b beta-compile echo $(gh pr list -s open --json) - for pull_request in $(gh pr list -s open --json branch); do - echo "Merge ${pull_request}" - git merge origin/${pull_request} - done + # for pull_request in $(gh pr list -s open --json branch); do + # echo "Merge ${pull_request}" + # git merge ${pull_request} + # done - name: Push to Main run: |