Myself & another developer are working on a project. I push to master & have a branch for the other developer. But when I merge the code pushed to the branch, I get merge conflict errors due to some files generated when building the project. How to configure Git correctly for Android Projects?
This is probably better asked in an Android development forum, rather than an Atlassian one (I'm just saying that to let you know not to expect much response from us)