Add gitattributes for having less conflicts in CHANGELOG.md during me…

…rging
ruflin · Oct 16, 2015 · da6fe6d · da6fe6d
1 parent 9bb2ef1
commit da6fe6d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+ansible
+build
+env
+vendor
+CHANGELOG.md
+Vagrantfile
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md  merge=union
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 .idea
 *.iml
 .vagrant
-.*
+.php_cs.cache
+
 cache.properties
 /nbproject
 build