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 Sign up to answer
Community showcase
Published Monday in Jira Ops

Jira Ops Early Access Program Update #1: Announcing our next feature and a new integration

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...

532 views 0 9
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