Interested in using Bamboo's pre-build merging feature, but wondering what happens if there are merge conflicts.
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.
On 31 May, a GDPR-related change went live in the Bitbucket Cloud API that resulted in users not being able to create or edit Bitbucket Cloud Linked repositories in Bamboo. This API update removed t...
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