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

During auto-merge how we can avoid merge conflict as many developers working on the same project?

SGD Atlassian Team Jul 30, 2014

Interested in using Bamboo's pre-build merging feature, but wondering what happens if there are merge conflicts.

1 answer

1 vote
SGD Atlassian Team Jul 30, 2014

Actually, I'd say you should embrace the merge conflict! The sooner you discover them, the easier they are to deal with. The great thing about pre-build merges is that they surface both merge conflicts and integration conflicts.

If merge conflicts do arrise, the build will fail at that point. From there, you can either resolve the merge conflicts or disable auto-merging, then re-run the build.

Suggest an answer

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

Cannot save a repository using Chrome v83 and other Chromium based browsers such as Edge

Hello Bamboo Community, I'm Jey from Bamboo Support team. If you have upgraded your Chrome browser to version 83 recently, it is observed that the save operation just spins and never completes w...

417 views 2 5
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