Small Bitbucket Team

[Brian Farnsworth]

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!

[Vishwajeet Singh]

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