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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.