Skip to content

Loading…

Fix the line endings on the Flash `.as` files #834

Merged
merged 1 commit into from

3 participants

@markjaquith

Many of the Flash .as source files have wonky DOS style line endings. Git seems to treat them as a single line, which means that when a single character changes, the diff will show the entire file as being different.

To fix them, I opened them in vim and ran:

%s/^M/\r/g

Note: You can't just type ^M, you have to type Ctrl-V, Ctrl-M to get this magic character to appear. You'll know you did it right if you get a highlighted ^M like this:

vim-ctrl-v-ctrl-m

And then I ran.

set ff=unix

@johndyer johndyer merged commit 01799b2 into johndyer:master
@svoynow

This problem is going to keep recurring, due to the way the Flash Professional deals with line endings. I think the solution is to have Git launder the line endings on check-in.

https://help.github.com/articles/dealing-with-line-endings.

Looks like somebody tried to do this w/ a7afd52.
But if the problem has recurred since then (and it appears from this pull request that it has), maybe it wasn't done correctly?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 12, 2013
  1. @markjaquith
Something went wrong with that request. Please try again.