Skip to content
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

added gitattributes file #3698

Merged
merged 1 commit into from Jul 18, 2023

Conversation

vicentebolea
Copy link
Collaborator

@vicentebolea vicentebolea commented Jul 18, 2023

This is needed to avoid having other than LF EOL in the repo. Having CRLF returns makes difficult impossible to properly patch files.

This was needed for backporting patches to the Conda pkg

@vicentebolea
Copy link
Collaborator Author

Merging without review since it is a small change in the CI and I need it to be merged in order be tested. I take full responsibility of its impact 👼

Note that the CI is red since this whitespace change cannot apply in this PR since the PR tests the merge-head from master. We have to go ahead and merge to see this change.

@vicentebolea vicentebolea merged commit 771f5ae into ornladios:master Jul 18, 2023
10 of 12 checks passed
@vicentebolea vicentebolea deleted the add-gitattribute-file branch July 19, 2023 20:46
vicentebolea added a commit to vicentebolea/ADIOS2 that referenced this pull request Aug 2, 2023
…file

added gitattributes file

(cherry picked from commit 771f5ae)
This was referenced Aug 2, 2023
vicentebolea added a commit that referenced this pull request Aug 3, 2023
* release_29:
  Bump version to v2.9.1
  Merge pull request #3676 from pnorbert/c_version2
  Merge pull request #3697 from ornladios/dependabot/pip/docs/cryptography-41.0.2
  Merge pull request #3698 from vicentebolea/add-gitattribute-file
  Merge pull request #3704 from ornladios/dependabot/pip/docs/pygments-2.15.0
  Merge pull request #3712 from ornladios/dependabot/pip/docs/certifi-2023.7.22
  Merge pull request #3687 from dmitry-ganyushin/i3646-mult-macos
  Merge pull request #3699 from vicentebolea/revert-normalize-eol
  Merge pull request #3689 from vicentebolea/fix-evpath-modules
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant