From 48e3cb81b13652bd02f60b41c907405714c8ad75 Mon Sep 17 00:00:00 2001
From: syui <syui@syui.ai>
Date: Thu, 8 Jan 2026 13:19:29 +0900
Subject: [PATCH] fix

---
 install.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install.zsh b/install.zsh
index 77fd8b0..c298512 100755
--- a/install.zsh
+++ b/install.zsh
@@ -276,6 +276,10 @@ function at-repos-patch-apply-all() {
 			repo="atproto"
 		elif [[ $filename == *"feed"* ]]; then
 			repo="feed-generator"
+			# feed-generatorパッチ適用前に既存のDockerfileを削除（upstreamと競合回避）
+			if [[ $filename == "200-feed-generator-custom.patch" ]]; then
+				rm -f "$d/repos/feed-generator/Dockerfile"
+			fi
 		fi
 
 		patch-apply "$title" "$repo" "$filename"