diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index fdd9bc67..38d23ea4 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -24,9 +24,8 @@ jobs: - name: Pull GitLang Main run: | - git checkout -b temp ls -A1 | xargs rm -rf - git init + git init -b main git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" git remote add origin https://github.com/chiefmikey/gitlang-beta @@ -39,11 +38,12 @@ jobs: run: | echo test: $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName') for branch in $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName'); do - git merge --allow-unrelated-histories origin/${branch} || true + git fetch origin ${branch} + git merge --allow-unrelated-histories ${branch} || true done - name: Push to Main run: | git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" - git push -u origin HEAD:main + git push -fu origin main