Small Bitbucket Team

So I am working on an Android app with one other person, and we are using a Bitbucket Team account currently to collaborate. Currently, we each have our own account and then there is an administrator account. Every time we want to edit the main repo, we each make our own fork and then do a pull request. Then one of us has to go into the admin account and merge the changes. And then we both have to create new forks again and repeat the process. There must be a better way. Is there a way that both of us can simply have write access to the same main repo, and just push and pull from it periodically? And then, if there was a conflict, who ever is pulling/pushing it at the time of the conflict would be able to simply choose the version that is most correct etc? Sorry if this is a basic question, we are struggling to understand the best way to do things here. Thanks!

1 answer

This widget could not be displayed.

Create a new repository, add your current code base and give access of same to everyone in team and it should just work fine.

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted Wednesday in Teamwork

What teamwork quotes inspire you?

Hey everyone! My name is Natalie and I'm an editor of the Atlassian Blog and I've got a question for you: What's your favorite quote about teamwork?  We've compiled a list here, along with...

135 views 16 7
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you