version control

[Soldier]

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?

[Bastian Stehmann]

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

[Soldier]

Hi @Bastian Stehmann ,

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

[Bastian Stehmann]

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.

[Soldier]

Hi Bastian,

Thanks for your prompt action.

BR,

Soldier