Prevent auto-merge of acknowledgements

signalapp · Dec 15, 2023 · 2c66d66 · 2c66d66
1 parent a1fa840
commit 2c66d66
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# Prevent auto-merging of generated acknowledgment files
+acknowledgments/acknowledgments.* -merge -text
+acknowledgments/acknowledgments.*.hbs merge text=auto