search

itesla / ipsl

The iTesla Power System Library is a Modelica library developed as part of the iTesla project. The library contains a set of power system component models for phasor time domain simulations.
Mozilla Public License 2.0
23 stars 72 forks source link

Add a git attributes file that allows native file ending checkout #98

Closed dietmarw closed 8 years ago

dietmarw commented 8 years ago

This makes it easier for people to contribute from different OS platforms.

See also https://help.github.com/articles/dealing-with-line-endings/

dietmarw commented 8 years ago

Once accepted I can normalize all line endings. But doing so makes only sense once everybody has committed the their WIP as it will touch quite a lot of files.

MaximeBaudette commented 8 years ago

@dietmarw Since I have merged this PR we all get files that appear as modified (without any changes visible), so I suspect that it is something related to the line ending format. The thing is, while I perfectly understand this should happen just after merging the .gitattribute, I don't understand why it keeps happening after that we have followed step by step the procedure provided in the link you mentioned. (actually we even did this procedure 2 times on different computers). Now we face the issue that we have to constantly make dumb commits kinda every time we need to change branch on our computers... When everything was fine before that.

dietmarw commented 8 years ago

@MaximeBaudette I guess you forgot to fix the line endings once after accepting the pull request. This means they are still stored with mixed EOL and will also be refreshed with those. I can fix them for you as said before using my ttws tool and then create a PR with that.

One thing though. All other forks should rebase their PR-branches (git pull --rebase) before merging in case they started to work on their branch before the EOL normalisation.

MaximeBaudette commented 8 years ago

@dietmarw well we did the procedure described in the link you provided, and twice... Also at least me had the same configuration in my general gitconfig file... so this shouldn't have an impact. But sure, if you think you can fix something, please try it :-)

dietmarw commented 8 years ago

See #116.