diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..149ac29b7b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+oca_dependencies.txt merge=union
+