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.
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?
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 everyone, We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...
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