-
Notifications
You must be signed in to change notification settings - Fork 36
Replace tabs with two spaces #19
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
Conversation
|
Do you think two spaces is a good choice? I am more used to four spaces. |
|
Most files here use two spaces for indentation. But, there are many tabs sprinkled in several files. Replacing these with two spacings generally keeps the indentation consistent. (I also prefer four spaces for indentation, but I've worked on repos that used two.) |
|
So I wait for the decision of the repo-owner. |
|
Two vs. four vs. something else should be another issue. This should be a noncontroversial cleanup. |
|
I made a mistake of merging. There were many errors in the tabs branch. I did not pay enough attention since large diffs are not presented in the github window. Tom, could you help undo the merge? |
|
I'm sorry about that, @HildingElmqvist. I must have goofed something. If we get Travis set up for CI testing, it'll help avoid this type of thing (we need to register ModiaMath first). We can tell if a PR will mess up the package tests. I'm not a git or github expert. It looks like you can use GitHub to revert a PR. See here: https://help.github.com/articles/reverting-a-pull-request/ If that doesn't work, a manual way to do that is to revert a local branch to the last known good version. Then, you can submit that as a PR. It looks like the last good version is 90f52e9. Git is complicated and confusing, but the good news is that it's hard to lose information, so we should be able to backtrack. |
|
I can also take a look to see if I can fix what I broke. Will look tonight. |
|
Looks like the damage was limited to one file. Working on a PR to fix it now. |
|
FYI, the way I fixed it was to revert the damaged file (in a separate branch): I ran the package tests in Julia to make sure they passed. I edited |
Tabs are causing formatting issues on GitHub and in my local editor. This PR is a mass search and replace. There are still inconsistencies with indentation, but this helps.