Prevent merge conflicts of the changelog files

owncloud-archive · May 29, 2016 · c7590d4 · c7590d4
1 parent 3503b55
commit c7590d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/Makefile b/Makefile
@@ -60,6 +60,8 @@ appstore: clean install-deps optimize-js
 	--exclude=$(project_dir)/build/artifacts \
 	--exclude=$(project_dir)/node_modules \
 	--exclude=$(project_dir)/.bowerrc \
+	--exclude=$(project_dir)/.gitattributes \
+	--exclude=$(project_dir)/.gitignore \
 	--exclude=$(project_dir)/.jscsrc \
 	--exclude=$(project_dir)/.jshintrc \
 	--exclude=$(project_dir)/.jshintignore \