Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,362,638
Community Members
 
Community Events
168
Community Groups

How to configure Git for Android Studio Projects (Java/Kotlin)

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?

2 comments

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)

Like Soumyadeep Mandal likes this

Comment

Log in or Sign up to comment
TAGS

Atlassian Community Events