Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

How would automatic branch merging work for monorepos?

Александр Чудеснов
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
January 31, 2018 edited

We use Bitbucket to host a large monolithic front-end application that is gradually being split to individual packages using lerna. Historically we have our main develop branch to merge all recent release branches into. However, release history is not linear because of the individual packages architecture, so we might have:

   | - other-app/release/10.0 - latest
/
/
| | some-app/release/12.0
| /
| /
|\/
|/\
| \
| | - some-app/release/11.0
| |
| |
|\ /
| \
|/ \
| |- other-app/release/9.0 released
| |
| /
| /
|/
| - develop

(I'm not very good at charts).

So what if, say, we want to fix something in some-app/release/11.0 before it's released and have it auto-merged into some-app/release/12.0 but not other-app/release/* and develop?

 

1 answer

1 vote
Ana Retamal
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
February 1, 2018

Hi! If you fix something in some-app/release/11.0 it won't be auto-merged into other-app/release/ because it doesn't follow the naming convention. In order to use automatic branch merging, Bitbucket Server has to be able to determine the ordering of branches, and relies on semantic versioning of branch names. For more information, please check Automatic branch merging.

Let us know if you have any questions!

Best regards,

Ana

 

Александр Чудеснов
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
August 21, 2018

The question is: is Bitbucket capable of tracking multiple configurations (some-app/release/, other-app/release/) that should not interfere with each other in a single repository or it can only have one per repo?

Suggest an answer

Log in or Sign up to answer
TAGS
atlassian, compass, developer experience, devex, platform engineering, internal developer platform, component catalog, atlassian learning, productivity tools, developer productivity, software architecture, compass webinar, engineering teams

Discover how Compass drives DevEx and productivity at Atlassian 🏃🏻‍♂️

Learn why Compass was built to tackle dev experience at scale. See how Atlassian uses it to boost visibility, reduce cognitive load, and drive consistency—plus tips to get started and customize your IDP for stronger team engagement.

Join the webinar ✨
AUG Leaders

Atlassian Community Events