From ea6e7cc649543e6785313d193cc8279bd07d4184 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Fri, 13 Mar 2026 08:29:39 +0900
Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E4=B8=8A=E6=B5=81=E3=81=AE?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E6=99=82=E3=81=AB=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=B8=88=E3=81=BF=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?=
 =?UTF-8?q?=E7=B6=AD=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/merge-upstream.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index e07c4f0a27..cbe95dab34 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -45,6 +45,13 @@ jobs:
           git checkout HEAD -- .github/
           git reset HEAD .github/
 
+          # Keep "deleted by us" files deleted
+          git status --porcelain=v1 -z | while IFS= read -r -d '' entry; do
+            case "$entry" in
+              "DU "*) git rm -- "${entry#DU }" ;;
+            esac
+          done
+
           # Commit the merge with conflict markers
           git commit -a -m "Merge upstream changes from ${{ github.event.inputs.upstream_ref }}"
 

From 8d1f37cfd91c73897fcf63afc9b4b0887875b751 Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Tue, 23 Jun 2026 20:34:02 +0900
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E4=B8=8A=E6=B5=81=E3=81=AE?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E6=99=82=E3=81=AB=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=B8=88=E3=81=BF=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE?=
 =?UTF-8?q?=E7=B6=AD=E6=8C=81=E5=AF=BE=E8=B1=A1=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/merge-upstream.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index cbe95dab34..154703d3e8 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -45,10 +45,11 @@ jobs:
           git checkout HEAD -- .github/
           git reset HEAD .github/
 
-          # Keep "deleted by us" files deleted
+          # Resolve delete/modify conflicts by keeping the deletion
           git status --porcelain=v1 -z | while IFS= read -r -d '' entry; do
             case "$entry" in
               "DU "*) git rm -- "${entry#DU }" ;;
+              "UD "*) git rm -- "${entry#UD }" ;;
             esac
           done
 

From e78dab5e00a22451fc72aa4448fb4b4987632a0d Mon Sep 17 00:00:00 2001
From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com>
Date: Tue, 23 Jun 2026 20:46:11 +0900
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E4=B8=8A=E6=B5=81=E3=81=AE?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E6=99=82=E3=81=AB=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=B8=88=E3=81=BF=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE?=
 =?UTF-8?q?=E7=B6=AD=E6=8C=81=E5=AF=BE=E8=B1=A1=E3=82=92=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/merge-upstream.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index 154703d3e8..1f958a543e 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -45,10 +45,9 @@ jobs:
           git checkout HEAD -- .github/
           git reset HEAD .github/
 
-          # Resolve delete/modify conflicts by keeping the deletion
+          # Resolve files deleted upstream in delete/modify conflicts
           git status --porcelain=v1 -z | while IFS= read -r -d '' entry; do
             case "$entry" in
-              "DU "*) git rm -- "${entry#DU }" ;;
               "UD "*) git rm -- "${entry#UD }" ;;
             esac
           done