Ok to answer my own question. To go back to using .gitignore, do the following:
- Go to Settings > Version Control > Ignored Files and remove all ignored files. Hit Apply.
- Still in Settings > Version Control change the type of version control from Git to none. Hit Apply.
- Delete the project’s .git directory created previously.
- Create the following .gitignore file in the root directory of your project:
- VCS > Enable Version Control… to Re-enable Git.
- Then right click on the project root and select Git > Add to add the entire project.
Doing the above will utilize the .gitignore file instead of Settings > Version Control > Ignored Files to commit the right files.
For me the process was a little easier:
- In Android Studio: Settings > Version Control > Ignored Files >
Remove all ignored files > Apply
- Backup .gitignore. Create an empty new .gitignore. (in the root folder)
- Restart Android Studio!
- Fill up the new .gitignore with the old one. Don’t forget to commit the change .gitignore + related ignored/deleted files!
No re-enable VCS required! I’m working with a GitRepo, which is extremely inconvient to do re-enabling VCS. The steps helped.