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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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)

@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
Community showcase
Published in Confluence Cloud

🎨 Add some visual life to your templates

Hi Atlassian Community, My name is Avni Barman, and I am a Product Manager on the Confluence Cloud team. Based on feedback from you, we are giving admins more power to create templates that a...

239 views 4 9
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you