Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources

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.

Get started Tell me more
Atlassian Community about banner
4,362,638
Community Members
 
Community Events
168
Community Groups

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

soorajmca7
soorajmca7 Dec 20, 2020

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?

Comment
Watch
Like Soumyadeep Mandal likes this
621 views

2 comments

Like
Reply
Nic Brough _Adaptavist_
Nic Brough _Adaptavist_ Community Leader Dec 20, 2020

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
Reply

Comment

Log in or Sign up to comment
Bitbucket
Bitbucket
TAGS

Atlassian Community Events

See all events