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

Question

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:

Hope you can help ...

/Jesper

Jesper Gadeberg · Answer

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

Christian Glockner · Answer

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