Update .gitattributes

samdark · samdark · commit bffc547e67bc · 2020-11-18T21:51:56.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -23,9 +23,15 @@
 
 # Ignore some meta files when creating an archive of this repository
 /.github            export-ignore
+/.editorconfig      export-ignore
 /.gitattributes     export-ignore
+/.gitignore         export-ignore
 /.scrutinizer.yml   export-ignore
+/phpunit.xml.dist   export-ignore
+/tests              export-ignore
+/docs               export-ignore
 
-# CHANGELOG
+# Avoid merge conflicts in CHANGELOG
+# https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
 /CHANGELOG.md		merge=union
 
