Closed SeSodesa closed 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.
Tässä näyttää olevan konflikti.
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.
This pull request can be closed without merging. The most recent version of the file does not contain any unnecesary whitespace or <CR>
symbols.
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 preventingcrlf
s from making it into the repository by instructing Git to perform automatic changes fromcrlf
tolf
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. 🤷🏻♂️