GitHub user krichter722 opened a pull request:
https://github.com/apache/storm/pull/2595
set '* text=auto' in .gitattributes in order to avoid merge work because of
line feed changes
Unfortunately, `git` doesn't initialize repositories by default with this
`.gitattributes` and this value, but sooner or later merge work or discussions
will arise from the fact that contributions don't match with the common line
endings (currently both LF and a few CRLF are used). It makes sense to convert
them once to the same (LF here) and enforce all contributions to have the same
EOL from then on. This happened here.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/krichter722/storm gitattributes
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/2595.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2595
----
commit d6201b6184473a93f8a40342ca9e6901af0f65a4
Author: Karl-Philipp Richter <krichter722@...>
Date: 2018-03-18T23:14:20Z
set '* text=auto' in .gitattributes in order to avoid merge work because of
line feed changes
----
---
