From 161a16fe95fa58b59119186b4bc2cf7f0f8a2776 Mon Sep 17 00:00:00 2001
From: bravesasha <braveradovenchyk@gmail.com>
Date: Tue, 14 Apr 2026 10:31:53 +0300
Subject: [PATCH] fix(script): check correct file when detecting merge
 conflicts

---
 scripts/apatch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/apatch.sh b/scripts/apatch.sh
index f56771d9efdb..44591e5e2cd5 100755
--- a/scripts/apatch.sh
+++ b/scripts/apatch.sh
@@ -49,7 +49,7 @@ fi
 	done
 	for i in $($gitcmd status --porcelain | awk '{print $2}'); do
 		filedata=$(cat "$i")
-		if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
+		if [ -f "$i" ] && [[ "$filedata" == *"<<<<<"* ]]; then
 			export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
 		else
 			$gitcmd add --force "$i"