-1
At some point in our project, local settings files were sent (workspace.xml, app.iml) to the git. Among these files, some of the Gradle (cache.properties.lock, fileHashes.bin, fileSnapshots.bin, outputFileStates.bin, taskArtifacts.bin).
I believe those files were in .gitignore, but I can’t get them back, and now every pull these same files give conflicts because they are settings changed by the IDE locally.
How can I add them again? Everyone should be on .gitignore?
I do not understand the intention. You want to remove them from the source control?
– dcastro
That’s right, since these files are generated by each programmer in their IDE, we don’t need to upload them to git, avoiding conflicts with each pull.
– user29982