Update .gitattributes

eepifanova · web-flow · commit 3bd7a82d43e5 · 2025-03-28T14:01:58.000Z
add exceptions to prevent merging some 'internal' files
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 # Set the default behavior for correcting line endings, 
 # in case people don't have core.autocrlf set.
 * text=auto
-
+.github/workflows/update_from_nginx_documentation.yml merge=ours
+.gitattributes merge=ours
