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

SGD
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
July 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
Atlassian Team members are employees working across the company in a wide variety of roles.
July 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
AUG Leaders

Atlassian Community Events