From 0fdd43270d617486f87d2c0670c3926affc19c4a 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] =?UTF-8?q?chore:=20=E4=B8=8A=E6=B5=81=E3=81=AE=E3=83=9E?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E6=99=82=E3=81=AB=E5=89=8A=E9=99=A4=E6=B8=88?=
 =?UTF-8?q?=E3=81=BF=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E7=B6=AD?=
 =?UTF-8?q?=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=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, 3 insertions(+)

diff --git a/.github/workflows/merge-upstream.yml b/.github/workflows/merge-upstream.yml
index e07c4f0a27..e2af037b56 100644
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -45,6 +45,9 @@ jobs:
           git checkout HEAD -- .github/
           git reset HEAD .github/
 
+          # Keep "deleted by us" files deleted
+          git status --porcelain | grep '^DU' | cut -c 4- | xargs -r git rm
+
           # Commit the merge with conflict markers
           git commit -a -m "Merge upstream changes from ${{ github.event.inputs.upstream_ref }}"