Normalize line endings #642
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
|
For what it's worth, I support this change. As I mentioned in the other PR, my experience from multiple projects for many years is that this works well. Additionally, this PR has been executed in a good way - by that I mean that it contains only the line ending changes (apart from the gitattributes file of course), meaning that it is easy to verify using diff that it doesn't try to sneak in any behaviour changes. |
…into normalise-line-endings # Conflicts: # src/FluentNHibernate.Testing/Cfg/ExceptionSerializationTests.cs # src/FluentNHibernate.Testing/ConventionsTests/AccessConventionTests.cs # src/FluentNHibernate.Testing/DomainModel/Mapping/MappingTester.cs # src/FluentNHibernate.Testing/FluentInterfaceTests/ClassMapFilterPartModelGenerationTests.cs # src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj # src/FluentNHibernate.Testing/Infrastructure/ContainerTester.cs # src/FluentNHibernate.Testing/PersistenceModelTests/SeparateSubclassVisitorFixture.cs # src/FluentNHibernate.Testing/Serialization/SerializationFixture.cs # src/FluentNHibernate.Testing/SpecificationExtensions.cs # src/FluentNHibernate.Testing/Testing/XmlWriterTestHelper.cs # src/FluentNHibernate.Testing/Xml/MappingXmlTestHelper.cs
|
Thanks |
|
I think this would conflict with .editorconfig file: fluent-nhibernate/.editorconfig Lines 6 to 7 in 6c8df85 |
|
@hazzik Thanks! I've removed that line from the editorconfig and also updated the contributing guidelines to remove references to disabling autocrlf |
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.
Normalise line endings and enable
autocrlf. This should result in all files ending in CRLF in windows and LF in Linux (and Git). This will resolve the warnings in VS about inconsistent line endings.I've opened this PR based on the conversation at #641. I'll keep both PRs open for now and when one approach is selected I'll close the other PR.