Conflict resolution workflow

Bitbucket has a very nice feature to detect conflicts prior to issuing a merge. Crucible appears to not have this same feature or if it does, I'm not certain what the path to activating it is. I expected the "auto update" feature in crucible to just detect this and subsequently show me something similar to what I see in Bitbucket but alas - that did not occur.

I made two branches from a common branch, made conflicting changes to each branch and pushed both out, merging one of the branches down to the common root branch. Then I made a crucible branch review from the non-merged branch to the common root but it has not "auto updated" yet.

Is this a known issue? Can I solve this problem? Is my question clear (I hope)

1 answer

any chance a bump comment will get this question noticed? :) thanks (if it works)

Suggest an answer

Log in or Join to answer
Community showcase
Alexey Matveev
Published Saturday in Jira

How to run Jira in a docker container

Everything below is tested on Ubuntu 17.10. I prefer to use Jira in a docker container because: 1. I can install Jira with a couple of commands. 2. I can start and stop Jira just by starting and s...

67 views 1 4
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot