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} diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index 4f22cb48..325cdb66 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -25,7 +25,7 @@ jobs: - name: Merge branches run: | git checkout -b beta-compile - echo $(gh pr list -s open --json) + echo $(gh pr list -s open --json id) # for pull_request in $(gh pr list -s open --json branch); do # echo "Merge ${pull_request}" # git merge ${pull_request}