From 2c66d66d2dbefbeb96edf9f05e58a963487127c9 Mon Sep 17 00:00:00 2001
From: adel-signal <adel@signal.org>
Date: Fri, 15 Dec 2023 13:48:48 -0800
Subject: [PATCH] Prevent auto-merge of acknowledgements

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitattributes

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