diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index 08c7558f..ebc7113b 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -28,8 +28,8 @@ jobs: 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 - git remote add upstream https://github.com/chiefmikey/gitlang + git remote add origin https://github.com/chiefmikey/gitlang-beta.git + git remote add upstream https://github.com/chiefmikey/gitlang.git git pull upstream main - name: Merge Branches @@ -38,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