From 9b8ddf3e354a4ee40f8c7eef357793a3c2912ed8 Mon Sep 17 00:00:00 2001
From: Miki <miki@amazon.com>
Date: Wed, 2 Nov 2022 13:34:41 -0700
Subject: [PATCH] Update backport workflow to ignore changelog conflicts
 (#2729)

Signed-off-by: Miki <amoo_miki@yahoo.com>

Signed-off-by: Miki <amoo_miki@yahoo.com>
Signed-off-by: Ajay Gupta <ajyg@amazon.com>
---
 .github/workflows/backport.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index f515b254b868..1d05b4169306 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -22,10 +22,9 @@ jobs:
           # opensearch-trigger-bot installation ID
           installation_id: 22958780
 
-      # Using fork of https://github.com/tibdex/backport
-      # https://github.com/tibdex/backport/pull/81
       - name: Backport
-        uses: VachaShah/backport@v1.1.4
+        uses: VachaShah/backport@v2.1.0
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
           branch_name: backport/backport-${{ github.event.number }}
+          files_to_skip: "CHANGELOG.md"