Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Conflict resolution workflow

twx_clint January 6, 2016

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

0 votes
twx_clint January 11, 2016

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

Andy - PTC Redundant
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
September 16, 2019

@twx_clint : Super old question... did you ever get an answer to this, even if outside of Community!?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events