Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

version control

Dear All,

 

If I have changed the code and someone also do that at the same time, how can we commit the version to the Bitbucket?

1 answer

Hi Soldier,

Welcome to the community.

There are two things that can happen,  either it can be merged automatically or  ot. If not, you'll have to do that yourself. 

To make development easier,you are usually using different branches,so that it doesn't come to conflicts so often 

Here you can read a little bit more  about it.

https://www.atlassian.com/git

Hi @Bastian Stehmann _neusta portal services_ ,

Noted with thanks.

 

One more comment, when I check out a file & folder content and submit this version, but another also check out this file & folder at the same time, submitting that version, if both submit those version, then how can others get the correct version?

 

BR

Soldier

Hi Soldier,

The second one will have to get the latest version from bitbucket with pull, before he pushes his changes to the repository. 

So he has your changes and will have to merge them.

He then pushes the merged changes to the repository. 

This way, in the repository is always the last pushed version.

Hi Bastian,

 

Thanks for your prompt action.

 

BR,

Soldier

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

3,849 views 10 16
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you