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 files to be ignored by .gitignore #8

Merged
merged 4 commits into from
Nov 27, 2019

Conversation

giovannivelludo
Copy link
Contributor

@giovannivelludo giovannivelludo commented Nov 26, 2019

I was having problems with loading project settings on my machine, adding these files to .gitignore (which were ignored in our group's projects) seems to have fixed the issue.

@giovannivelludo giovannivelludo changed the title Hotfix/gitignore added file to be ignored by .gitignore Nov 26, 2019
@giovannivelludo giovannivelludo changed the title added file to be ignored by .gitignore added files to be ignored by .gitignore Nov 26, 2019
@CremaLuca
Copy link
Collaborator

Interesting, how does ignoring two modules files fix the problem? Is there a known reason or just straight magic?

Also i'm declining the other pull request to update gradle because it's also on this one.

@CremaLuca CremaLuca mentioned this pull request Nov 26, 2019
Copy link
Collaborator

@CremaLuca CremaLuca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All ok, I don't fully understand why but seems reasonable

@@ -38,6 +38,8 @@ captures/
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/modules.xml
.idea/navEditor.xml
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seen it also in https://gist.github.com/iainconnor/8605514
Might be a good thing to do then

@giovannivelludo
Copy link
Contributor Author

giovannivelludo commented Nov 27, 2019

@CremaLuca All I know is that Marco used a gitignore suggested by GitHub when he created the repository, while the gitignore we had in our group project was generated by Android Studio. I'm guessing the second way is better because the way Android Studio works changes with updates, and GitHub might not be always up to date with Android Studio changes.

@Cogno-Marco
Copy link
Owner

Yup, we can either let android studio create it's own, or use the one in the link @CremaLuca posted.
What would you prefer? I'd use the one of the link

@Cogno-Marco
Copy link
Owner

Also if this problem is here, then it's also in killer-app and network-dictionary

@giovannivelludo
Copy link
Contributor Author

I think we should use the one generated by Android Studio since we don't know if the one linked above will always be up to date.
Please don't merge this pull request until I remove the files I added to .gitignore, which I figured out is not done automatically by git.

@Cogno-Marco Cogno-Marco added the bug Something isn't working label Nov 27, 2019
@giovannivelludo
Copy link
Contributor Author

Ok, now the pull request can be merged.

Copy link
Owner

@Cogno-Marco Cogno-Marco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, seems fine to me too 👍 ready to be merged

@giovannivelludo
Copy link
Contributor Author

Merge it then

@Cogno-Marco
Copy link
Owner

Was waiting for @CremaLuca to see, seems there's no reason to wait so I'll merge myself

@Cogno-Marco Cogno-Marco merged commit 17c66cd into Cogno-Marco:master Nov 27, 2019
giovannivelludo added a commit to EIS0/smslibrary that referenced this pull request Nov 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants