-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Force LF style line endings in all text files #13928
base: main
Are you sure you want to change the base?
Conversation
As a repository we need to have consistent line endings so that we can resolve diffs sanely. Right now we haven't had an opinion on this. But some CRLF line endings caused major merge conflicts on Qiskit#13278 and was preventing unraveling an otherwise simple merge conflict resolution. This commit sets a global default to use LF line endings for all text files to prevent such issues in the future.
One or more of the following people are relevant to this code:
|
Pull Request Test Coverage Report for Build 13579080430Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
Somehow, it breaks the visual testing? |
The LaTeX and text-drawer tests use the same |
Summary
As a repository we need to have consistent line endings so that we can resolve diffs sanely. Right now we haven't had an opinion on this. But some CRLF line endings caused major merge conflicts on #13278 and was preventing unraveling an otherwise simple merge conflict resolution. This commit sets a global default to use LF line endings for all text files to prevent such issues in the future.
Details and comments
The two release note files were normalized by git after adding the .gitattributes file.