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.
Thanks for signing up for Jira Ops! I’m Matt Ryall, leader for the Jira Ops product team at Atlassian. Since this is a brand new product, we’ll be delivering improvements quickly and sharing updates...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs