Fix line endings

[ryantxu]

I have tried a few simple pull requests that get turned into whole file replacements!

Searching the web found that git takes a bit of setup to get automatic line ending handling.

This push request really just follows:
http:https://lydiapchung.wordpress.com/2012/06/01/github-for-windows-line-endings/

It may be better to just go though those steps yourself

[hazendaz]

Ryan, # 16 that is exactly the information I finally discovered for the line ending issue. When I attempted it locally, it just wanted to change all the third party stuff right out the gate so hopefully it fixes everything else after that. Rather than attempting a pull request at that point, I felt I needed to progress with ivy so that I wasn't doing a pull request on items that shouldn't be fixed and will be gone once ivy is in place.

[dblock]

I am closing this, the manifest part got merged. If there's something to be done about line endings, please open a new PR.

[ryantxu]

Sorry, I'm very confused by github... I thought #16 is about line endings (and nothing else) But it seems like every change is getting linked to every issue.

For this issue, I hoped to follow the directions in:
http:https://lydiapchung.wordpress.com/2012/06/01/github-for-windows-line-endings/

If you want me to submit a PR, I can give it another shot -- BUT it will be a big change that touches almost every file, so you may be more comfortable doing that yourself. It is only the changes in:
https://github.com/ryantxu/waffle/commit/20659bec7d77c36be00f683e1f13afa0dcc53598

[dblock]

I think your problems with Git start with the fact that your 1.5 branch has your changes and you're trying to branch from it. So I would do this:

Backup your code, just in case... then:

git checkout 1.5 # change to the 1.5 branch
git checkout -b 1.5-with-changes # create a new 1.5 branch with changes
git push origin 1.5-with-changes # push the branch to github, you now have 1.5 = 1.5-with-changes
git checkout 1.5
git reset --hard HEAD^1 # do this a few times, until you see that git log doesn't include any of your changes, now your 1.5 is behind my 1.5
git pull upstream 1.5 # sync your 1.5 to my 1.5
git push origin 1.5 --force # without force it will fail because it's going to overwrite commits you made (which you saved in your 1.5-with-changes branch)

Next time make sure to create a branch first, before making any changes, then push the new branch to github and make a PR from it. That's called a topic branch.

Why don't we leave those line endings alone for now? Github is fine letting me do diffs ignoring them, no?