Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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.

Atlassian Community Hero Image Collage

Wrong text - is it possible to change the 'Merge conflict' help text?

Hi,

We are using Atlassian Bitbucket v5.4.1 and the help text found under 'More information' is wrong. Our main branch is called 'Stable' (protected) and that is possibly the reason for the issue.

When a merge conflict is found the following text is shown:

This pull request can't be merged.
You will need to resolve conflicts to be able to merge. More information.

Clicking 'More information' shows this:

Merge conflict issue.png

Hope you can help ...

/Jesper

1 answer

0 votes

Hi Jesper,

I think this is a known issue for which we have a feature request, which we're tracking as https://jira.atlassian.com/browse/BSERV-8480.

Cheers,

Christian

Premier Support Engineer

Atlassian

Hi Christian,

This dates back to 2016 and still not resolved, correct? At least the text should be removed as it causes confusion and just point to a resource on resolving merge issues. The only thing worse than not having a help text is having a wrong help text ...

/Jesper

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Calling any interview participants for Bitbucket Data Center

Hi everyone,  We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...

515 views 6 4
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