Normalize line endings #336
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
That's good incentive to accept / reject as many PRs as makes sense for 0.7.0. :-) |
|
We can also include #341 in this PR, when the time comes. |
Closed
dahlbyk
force-pushed
the
normalize-line-endings
branch
from
08ea9bd
to
4256c20
Compare
|
Well crap, should have waited for build to run: https://ci.appveyor.com/project/dahlbyk/posh-git/build/0.7.158. Tests aren't happy about the line ending normalization. |
|
I can fix that tonight, if you want. |
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.
We don't need to merge this before we ship 0.7 (#327), but this will close #334.
There is a good chance GitHub will refuse to merge the remaining open PRs. To resolve, we will want to set
git config --global merge.renormalize true, ensuremasteris up-to-date, and then either:git rebase masterto replay changes after the normalizationgit merge masterto bring in these changes