feature 16099 - Configure rebasing strategy for dependabot created PRs

Signed-off-by: prateekrai1 <prateek@gmail.com>

.github/workflows/dependabot_pr.yml

@@ -22,6 +22,33 @@ jobs:
         with:
           token: ${{ steps.github_app_token.outputs.token }}
 
+
+      # Rebase Strategy
+      - name: Rebase PR branch onto base branch
+        run: |
+          git fetch origin
+          git checkout ${{ github.head_ref }}
+          git rebase origin/${{ github.base_ref }} || git rebase --abort
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Resolving merge conflicts
+      - name: Attempt to resolve conflicts
+        run: |
+          git merge --strategy-option theirs || git merge --abort
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Commit the changes after resolving conflicts
+        if: success()
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Resolve merge conflicts automatically"
+          branch: ${{ github.head_ref }}
+          commit_user_name: dependabot[bot]
+          commit_user_email: support@github.com
+          commit_options: '--signoff'
+
       # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -68,3 +95,4 @@ jobs:
           commit_user_name: dependabot[bot]
           commit_user_email: support@github.com
           commit_options: '--signoff'
+

CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 2.x]
 ### Added
+- Adding configuring rebasing strategy for dependabot created PRs([#16099](https://github.com/opensearch-project/OpenSearch/issues/16099))
 - Add support for async deletion in S3BlobContainer ([#15621](https://github.com/opensearch-project/OpenSearch/pull/15621))
 - MultiTermQueries in keyword fields now default to `indexed` approach and gated behind cluster setting ([#15637](https://github.com/opensearch-project/OpenSearch/pull/15637))
 - [Workload Management] QueryGroup resource cancellation framework changes ([#15651](https://github.com/opensearch-project/OpenSearch/pull/15651))