Merge pull request #6110 from LLK/kchadha-release-workflow-no-ff

Update Release Workflow

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
           git config --global user.name "${{ github.actor }}"
           git checkout -b ${{ steps.vars.outputs.branch }}
-          git merge origin/develop
+          git merge --no-ff origin/develop
           git push --set-upstream origin ${{ steps.vars.outputs.branch }}
       - name: Develop PR
         uses: repo-sync/pull-request@v2