mirror of
https://github.com/signalapp/libsignal.git
synced 2024-09-20 12:02:18 +02:00
20c4966cd8
Adjust the attributes so that git will treat the generated acknowledgment files as binary for the purposes of merging. This will ensure that a merge of two branches that both alter the acknowledgments will require manual resolution (ideally by re-running the generation script).
4 lines
158 B
Plaintext
4 lines
158 B
Plaintext
# Prevent auto-merging of generated acknowledgment files
|
|
acknowledgments/acknowledgments.* -merge -text
|
|
acknowledgments/acknowledgments.*.hbs merge text=auto
|