From a1db839c5b9ad916cb2874757946674984266319 Mon Sep 17 00:00:00 2001 From: lpm0073 Date: Thu, 16 Nov 2023 20:56:55 -0600 Subject: [PATCH] chore: add git pull after checking out dev branch --- .github/workflows/pushMain.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pushMain.yml b/.github/workflows/pushMain.yml index 2c3737d1..9ed59636 100644 --- a/.github/workflows/pushMain.yml +++ b/.github/workflows/pushMain.yml @@ -32,6 +32,7 @@ jobs: git checkout main git pull git checkout next + git pull git merge --allow-unrelated-histories main git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:next @@ -44,6 +45,7 @@ jobs: git checkout main git pull git checkout next-major + git pull git merge --allow-unrelated-histories main git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:next-major @@ -56,6 +58,7 @@ jobs: git checkout main git pull git checkout alpha + git pull git merge --allow-unrelated-histories main git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:alpha @@ -68,6 +71,7 @@ jobs: git checkout main git pull git checkout beta + git pull git merge --allow-unrelated-histories main git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:beta