sampsapursiainen / zeffiro_interface

Interface for using finite elements in inverse problems with complex domains
GNU General Public License v3.0
24 stars 15 forks source link

Fix line endings in zef_adaptive_grid_search_draft the second time #185

Closed SeSodesa closed 1 year ago

SeSodesa commented 1 year ago

This is just to normalize the line endings across the whole project. Looks like the documentation added to the function was written on a Windows machine, so these were added in that context.

The file .gitattributes should be preventing crlfs from making it into the repository by instructing Git to perform automatic changes from crlf to lf when new files are added to the index from the working tree (checked out commit/branch), but maybe some local Git configuration is overriding its effects. 🤷🏻‍♂️

SeSodesa commented 1 year ago

And just to clarify what the above means, in the output

>> git ls-files scripts/zef_adaptive_grid_search_draft.m --eol
i/crlf  w/lf    attr/text eol=lf        scripts/zef_adaptive_grid_search_draft.m

the index/repository line ending i/crlf should ideally be just i/lf, just like the working tree or checked out commit line ending w/lf is. For whatever reason it is not.

sampsapursiainen commented 1 year ago

Tässä näyttää olevan konflikti.

SeSodesa commented 1 year ago

Juu. Fernando ehti näköjään tehdä päivityksen päähaaraan ennen kuin tämä hyväksyttiin, joten konflikti ei yllätä. Päivittelen tämän ajan tasalle.

SeSodesa commented 1 year ago

This pull request can be closed without merging. The most recent version of the file does not contain any unnecesary whitespace or <CR> symbols.