correção conflito git pull

unb-mds · Sep 3, 2024 · 8afec75 · 8afec75
1 parent 9cfc95e
commit 8afec75
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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