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
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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,556,392
Community Members
 
Community Events
184
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
824 views

2 comments

Soumyadeep Mandal
Soumyadeep Mandal
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Get recognized
Dec 20, 2020

Hi @soorajmca7 ,

You can follow up this guide https://theworkingdad.it/2018/10/04/quickly-setup-android-studio-with-git-and-bitbucket/

Like
Reply
Nic Brough -Adaptavist-
Nic Brough -Adaptavist-
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
Become a 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
AUG Leaders

Atlassian Community Events

See all events