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