Always keep the NEWS file from the branch when merging

We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.

diff --git a/.gitattributes b/.gitattributes
index 92766523d81aeae573b32e81d2eb06e09ef9efc0..d8ee5cbbb3e49bdc13c6521955fdba14e8857cbe 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,4 @@ sapi/nsapi/nsapi.c              ident
 sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
+NEWS                            merge=ours