MAINT: Decrease merge conflicts in release notes

charris · charris · commit b20508c4d49b · 2017-02-12T12:32:26.000-07:00
Merge conflicts due to the release notes has been an annoying problem requiring a rebase of otherwise good PRs. The solution here is to use the --union option when merging to those files. Closes numpy#8603.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,9 @@
+# Line endings for Windows scripts
 * text=auto
 tools/win32build/nsis_scripts/*.nsi.in eol=crlf
 
 # Numerical data files
 numpy/lib/tests/data/*.npy binary
+
+# Release notes, reduce number of conflicts.
+doc/release/*.rst merge=union
