diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-02-12 12:32:26 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-02-12 12:32:26 -0700 |
| commit | b20508c4d49bd7269bcd42d39372a6b81af415cf (patch) | |
| tree | e6d2d70eb4f029b6ffb23292502eff9dfb0b52a1 /.gitattributes | |
| parent | d9d266ada4d90fb87b61773bb760e8e7e5bb6ba9 (diff) | |
| download | numpy-b20508c4d49bd7269bcd42d39372a6b81af415cf.tar.gz | |
MAINT: Decrease merge conflicts in release notes
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 #8603.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 82162cb8d..6e1de1b3d 100644 --- 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 |