Update workflow file to handle Git conflicts

Author: Taofeeqib

.github/workflows/devsecops-pipeline.yml

@@ -610,9 +610,16 @@ jobs:
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           
-          # Check for changes in remote and pull if needed
+          # Set merge strategy to avoid conflicts prompt
+          git config pull.rebase false
+          
+          # Fetch latest changes from remote
+          echo "Fetching latest changes from remote..."
+          git fetch origin ${GITHUB_REF_NAME}
+          
+          # Check for changes in remote and merge if needed
           echo "Checking for updates from remote..."
-          git pull origin ${GITHUB_REF_NAME} --no-rebase || echo "Failed to pull, proceeding anyway"
+          git pull origin ${GITHUB_REF_NAME} --strategy-option theirs || echo "Failed to pull, proceeding anyway"
           
           # Ensure docs/reports directory exists
           mkdir -p ./docs/reports/
@@ -632,9 +639,15 @@ jobs:
             echo "Committing report files..."
             git commit -m "Add security scan reports [skip ci]"
             
-            # Push to the repository
+            # Handle potential conflicts during push
             echo "Pushing changes to the repository..."
-            git push origin ${GITHUB_REF_NAME}
+            git push origin ${GITHUB_REF_NAME} || {
+              # If push failed, try pull and merge again
+              echo "Push failed, attempting to merge remote changes and retry..."
+              git pull origin ${GITHUB_REF_NAME} --strategy-option theirs
+              # Try push again
+              git push origin ${GITHUB_REF_NAME} || echo "Failed to push after merge attempt"
+            }
             
             echo "Reports have been committed and pushed to the repository."
             echo "View them at: https://github.com/${GITHUB_REPOSITORY}/tree/${GITHUB_REF_NAME}/docs/reports"