From f03420b5c77ae3cfa73fce4ffc7f4778cfa2b503 Mon Sep 17 00:00:00 2001
From: Francisco <fg@frang.io>
Date: Fri, 16 Jun 2023 15:42:19 -0300
Subject: [PATCH] Remove automatic conflict resolution for merge from release
 branch (#4362)

(cherry picked from commit 002a7c8812e73c282b91e14541ce9b93a6de1172)
---
 .github/workflows/release-cycle.yml           |  8 ++++--
 .../release/workflow/prepare-release-merge.sh | 27 -------------------
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 scripts/release/workflow/prepare-release-merge.sh

diff --git a/.github/workflows/release-cycle.yml b/.github/workflows/release-cycle.yml
index 2fd66458d3b..9d35022dc2e 100644
--- a/.github/workflows/release-cycle.yml
+++ b/.github/workflows/release-cycle.yml
@@ -192,6 +192,8 @@ jobs:
       pull-requests: write
     if: needs.state.outputs.merge == 'true'
     runs-on: ubuntu-latest
+    env:
+      MERGE_BRANCH: merge/${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -200,7 +202,9 @@ jobs:
         uses: ./.github/actions/setup
       - run: bash scripts/git-user-config.sh
       - name: Create branch to merge
-        run: bash scripts/release/workflow/prepare-release-merge.sh
+        run: |
+          git checkout -B "$MERGE_BRANCH" "$GITHUB_REF_NAME"
+          git push -f origin "$MERGE_BRANCH"
       - name: Create PR back to master
         uses: actions/github-script@v6
         with:
@@ -208,7 +212,7 @@ jobs:
             await github.rest.pulls.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              head: 'merge/${{ github.ref_name }}',
+              head: process.env.MERGE_BRANCH,
               base: 'master',
               title: '${{ format('Merge {0} branch', github.ref_name) }}'
             });
diff --git a/scripts/release/workflow/prepare-release-merge.sh b/scripts/release/workflow/prepare-release-merge.sh
deleted file mode 100644
index 4e6da5145dd..00000000000
--- a/scripts/release/workflow/prepare-release-merge.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-# Define merge branch name
-MERGE_BRANCH=merge/$GITHUB_REF_NAME
-
-# Create the branch and force to start from ref
-git checkout -B "$MERGE_BRANCH" "$GITHUB_REF_NAME"
-
-# Get deleted changesets in this branch that might conflict with master
-# --diff-filter=D - Only deleted files
-readarray -t DELETED_CHANGESETS < <(git diff origin/master --diff-filter=D --name-only -- '.changeset/*.md')
-
-# Merge master, which will take those files cherry-picked. Auto-resolve conflicts favoring master.
-# Ignore conflicts that can't be resolved.
-git merge origin/master -m "Merge master to $GITHUB_REF_NAME" -X theirs || true
-
-# Remove the originally deleted changesets to correctly sync with master
-rm -f "${DELETED_CHANGESETS[@]}"
-
-# Only git add deleted files
-git ls-files --deleted .changeset/ | xargs git add
-
-# Allow empty here since there may be no changes if `rm -f` failed for all changesets
-git commit --allow-empty -m "Sync changesets with master"
-git push -f origin "$MERGE_BRANCH"