diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..3e3a203c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Prevent auto-merging of generated acknowledgment files
+acknowledgments/acknowledgments.* -merge -text
+acknowledgments/acknowledgments.*.hbs merge text=auto