From 3d6f7aa7fe2ad4408f7790d5470019de9b029c25 Mon Sep 17 00:00:00 2001
From: Tonye Jack <jtonye@ymail.com>
Date: Mon, 20 Mar 2023 12:53:48 -0600
Subject: [PATCH] chore: add sec auto merge action (#1037)

---
 .github/workflows/sec-auto-merge.yml | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/sec-auto-merge.yml

diff --git a/.github/workflows/sec-auto-merge.yml b/.github/workflows/sec-auto-merge.yml
new file mode 100644
index 00000000000..3cf3bdcd6e7
--- /dev/null
+++ b/.github/workflows/sec-auto-merge.yml
@@ -0,0 +1,32 @@
+name: Auto merge and fix conflicts
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  automerge and fix conflicts:
+    runs-on: ubuntu-latest
+    name: Auto merge and fix merge conflicts
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Fix merge conflicts
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          
+          git checkout sec
+          
+          git merge --no-edit --no-ff --strategy-option=ours main
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        continue-on-error: true
+        with:
+          github_token: ${{ secrets.PAT_TOKEN }}
+          branch: sec