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

Version 0.9.2 #26

Merged
merged 10 commits into from
Jun 30, 2017
Merged

Version 0.9.2 #26

merged 10 commits into from
Jun 30, 2017

Conversation

SirkoVZ
Copy link
Contributor

@SirkoVZ SirkoVZ commented Jun 30, 2017

I'm not sure about all the .idea files, are they really necessary?

# Conflicts:
#	.idea/vcs.xml
#	README.md
#	app/app.iml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/details.xml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
@SirkoVZ
Copy link
Contributor Author

SirkoVZ commented Jun 30, 2017

...and the gradle files...?
...necessary?

@l3d00m
Copy link
Contributor

l3d00m commented Jun 30, 2017

I'll look into ignoring some more files / fixing some files

@l3d00m
Copy link
Contributor

l3d00m commented Jun 30, 2017

I've removed some more of the specific .idea files I missed before by adding

.idea/markdown-navigator
.idea/markdown-navigator.xml
projectFilesBackup

to my gitignore and removing them from git (not from your system) with

git rm -r --cached .idea/markdown-navigator
git rm -r --cached .idea/markdown-navigator.xml
git rm -r --cached projectFilesBackup

It is quite common to keep the gradle files as you can see in other big android projects e.g. 1 2 3. They are not user specific and have to get generated by Android Studio otherwise. The inspection settings are recommended to keep as they should be the same for everyone at the project.

Btw: Are you German? And is there a better way to reach you than through github or the mailing list?

Sorry for the troubles

@SirkoVZ
Copy link
Contributor Author

SirkoVZ commented Jun 30, 2017

Ja, per mail, z.B: [email protected]

@SirkoVZ SirkoVZ merged commit ca84564 into volkszaehler:master Jun 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants