Fix the line endings on the Flash .as files
#834
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johndyer
added a commit
that referenced
this pull request
Apr 12, 2013
Fix the line endings on the Flash `.as` files
|
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. |
phuongdh
pushed a commit
to avalonmediasystem/mediaelement
that referenced
this pull request
Oct 18, 2013
…ndings Fix the line endings on the Flash `.as` files
rexblack
pushed a commit
to rexblack/mediaelement
that referenced
this pull request
May 22, 2014
…ndings Fix the line endings on the Flash `.as` files
rexblack
pushed a commit
to rexblack/mediaelement
that referenced
this pull request
May 22, 2014
…ndings Fix the line endings on the Flash `.as` files
marmite22
pushed a commit
to elucidat/mediaelement
that referenced
this pull request
Dec 16, 2016
…ndings Fix the line endings on the Flash `.as` files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many of the Flash
.assource 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/gNote: 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^Mlike this:And then I ran.
set ff=unix