Force crlf line endings for VS2015 project files.

xiph / opusfile

Stand-alone decoder library for .opus streams

BSD 3-Clause "New" or "Revised" License

154 stars 81 forks source link

Force crlf line endings for VS2015 project files. #5

Closed pps83 closed 6 years ago

pps83 commented 7 years ago

Hi,

looks like some changes were added to pull request without me requesting that. Basically I made pull request for CRLF changes for VS project files, and then I committed to master of my cloned opusfile some changes. These were automatically added to outstanding pull request without me asking that. I think upstream libopus should have added these as submodules instead, I just did that for my own development. Or it makes more sense to have these as submodules of libopusfile?..

pps83 commented 7 years ago

All the changes that I commit to my fork for some reason automatically appear in this PR. And I don't see how to prevent that

wiiaboo commented 7 years ago

You prevent that by not doing PRs on master, but on a separate branch. You need to git force-push remove those extra commits or create a new PR with just the .gitattributes change.

rillian commented 6 years ago

I cherry-picked just the line-ending change in 54c2c289d6d9f9f0a672177429995e1f7a388de3. Thanks for the patch!