what does a label of "MERGE WITH CONFLICTS" side-by-side with commit in bitbucket mean ?

[Sharon Golan]

I merged a branch into my feature branch and during this merge i had to resolve a conflict.
After resolution I had a local merge commit which i pushed to the feature branch.

Now when i look at this commit in bitbucket I see a label of "MERGE WITH CONFLICTS" next to the commit sha. why is that ? does this label indicates this merge commit comprises a resolved confilict ? or is it indicating a conflict related problem ?

Thank you.

[Theodora Boudale]

Hi Sharon!

Are you using Bitbucket Cloud (repo URL starting with https://bitbucket.org/) or Bitbucket Server / Data Center?

I'm not aware of any such label showing in Bitbucket Cloud after resolving conflicts. Could you please also let me know:

• Which page are you looking at when you see this label? Is it a pull request page with these branches? Or a different page?
• Could you post a screenshot that shows where this label is displayed? (Please make sure to blur any private data in the screenshot before sharing it here)

Kind regards,
Theodora

[Sharon Golan]

Thank you Theodora. 
it is when I click the merge commit to see its details from the branch-commits view. i ' attaching here a capture.
I suspect this is due to uncommenting the Confilct lines inserted automatically by git in merge-commit comment. will check it on my next merge-with-resolved-conflict case.