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

How can I merge different branches of the same repository?

Dale Binkley April 26, 2024

I want to merge my dev branch into my test branch.  I was trying to use the Bamboo Repository Commit task but not sure how to commit to a different branch.

2 answers

2 accepted

1 vote
Answer accepted
Shashank Kumar
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
April 29, 2024

Hello Dale,

Welcome to Atlassian community.

You can look at Bamboo Automatic branch merging functionality to see if this helps you!

Regards

Shashank Kumar

*please don't forget to Accept the answer if your query was answered**

1 vote
Answer accepted
Jyothi Charupalli
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
April 29, 2024

Hi @Dale Binkley ,

Welcome to Atlassian Community!

In Bamboo, for automatic branch merging we have two merging models if you choose to automate your branch merging:

  • Branch Updater — a branch repo is kept up-to-date with changes to master. Note that changes on your master branch do not trigger branch builds.
  • Gatekeeper — the default repo is only updated with changes in the branch that have built successfully.

Please refer to this document under "Automatic branch merging" section for more details. https://confluence.atlassian.com/bamboo/using-plan-branches-289276872.html

Best Regards,

Jyothi

**please don't forget to Accept the answer if your query was answered**

Dale Binkley April 29, 2024

this looks like it'll work- need some time to digest.

Thanks for the answer

Dale

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events