diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index dd1e62cd..51ddec78 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -30,10 +30,10 @@ 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 + 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