From 7bd1d705fe60fbc67f91ce3e629255533398a98a Mon Sep 17 00:00:00 2001
From: Shwetabh Kumar <shwetabh.kumar@fyle.in>
Date: Thu, 12 Oct 2023 14:32:29 +0530
Subject: [PATCH] Pulling master before pushing new commit (#499)

---
 .github/workflows/production_deployment.yml | 1 +
 .github/workflows/staging_deployment.yml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml
index 3f1e8bb3..213ab407 100644
--- a/.github/workflows/production_deployment.yml
+++ b/.github/workflows/production_deployment.yml
@@ -61,6 +61,7 @@ jobs:
           git add .
           git commit -m "Update image tag"
           git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.PROD_DEPLOY_REPO }}
+          git pull origin master
           git push origin master
 
       - name: Create new Sentry release
diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml
index 1b776f79..cd6e46c4 100644
--- a/.github/workflows/staging_deployment.yml
+++ b/.github/workflows/staging_deployment.yml
@@ -49,6 +49,7 @@ jobs:
           git add .
           git commit -m "Update image tag"
           git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.STAGING_DEPLOY_REPO }}
+          git pull origin master
           git push origin master
 
       - name: Create new Sentry release