From 8afec7554ff7c9caf856476303234ecc718af652 Mon Sep 17 00:00:00 2001 From: Vini47 Date: Tue, 3 Sep 2024 18:32:35 -0300 Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20conflito=20git=20pull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bb4cb97..3652fc49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,9 @@ jobs: - name: Deploy changes run: | + git fetch origin git checkout -b projeto_deploy || git checkout projeto_deploy + git pull origin projeto_deploy git add . git commit -m "Deploy changes to projeto_deploy branch" || echo "No changes to commit" git push origin projeto_deploy