diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index a299850f..8c5eb22f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -30,10 +30,9 @@ jobs: git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" git checkout main - git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main - git reset --soft ${BRANCH} + git merge --allow-unrelated-histories ${BRANCH} + git checkout --theirs . git add . - git commit -am 'Beta 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 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: |