From 76b7211a5c3bb3e7a0a8b340f23460dbd82d2e82 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Mon, 23 Feb 2026 00:03:14 +0330
Subject: [PATCH] =?UTF-8?q?chore:=20prevent=20appsettings.Production.json?=
 =?UTF-8?q?=20from=20merging=20=E2=80=94=20keep=20ours=20strategy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f298b4b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Keep production config from current branch during merges — never overwrite
+src/BackOffice/wwwroot/appsettings.Production.json merge=ours