Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Deleted user
Level
0 / 0 points
Next:
badges earned
Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.
Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

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

Sign up for free Log in
Atlassian Community Hero Image Collage

Conflict resolution workflow

Clint D
Clint D Jan 06, 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)

Answer
Watch
Like Be the first to like this
255 views

1 answer

0 votes
Clint D
Clint D Jan 11, 2016

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

View More Comments
FUN MAN ANDY
FUN MAN ANDY Community Leader Sep 16, 2019

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

Like
Reply

Suggest an answer

Log in or Sign up to answer
Fisheye
Fisheye/Crucible
TAGS
Community showcase
Bridget
Bridget
Published in Confluence

⚡️NEW Group for Confluence Cloud Admins

Calling all Confluence Cloud Admins!  We created a new Community Group to support your unique needs as Confluence admins. This is a group where you can ask questions, access resou...

109 views 2 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