From da6fe6d6fba8c68ceba1683859e2b81f6aaeb60a Mon Sep 17 00:00:00 2001 From: Ruflin Date: Fri, 16 Oct 2015 10:53:10 -0700 Subject: [PATCH] Add gitattributes for having less conflicts in CHANGELOG.md during merging --- .dockerignore | 6 ++++++ .gitattributes | 1 + .gitignore | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 .gitattributes diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..df05ec6eb8 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +ansible +build +env +vendor +CHANGELOG.md +Vagrantfile \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..4c2a8ed233 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union diff --git a/.gitignore b/.gitignore index 7369e293f1..6cedd24741 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,8 @@ .idea *.iml .vagrant -.* +.php_cs.cache + cache.properties /nbproject build