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

Automatic Merge Commit Message

I have automatic merging turned for our release/* branches.

(Note that the branches are a sample)
image.png

 

We also use JIRA to track the features via the feature branches and the JIRA key.

 

However, we face an issue when there is a cascading conflict.
JIRA is unable to track the cascaded conflict as the source branch, target branch as well as the commit message does not mention the JIRA key.

 

As such, when such a conflict occurs, we can only rely on the notification that bitbucket send during a failed automatic merge. This is insufficient as the JIRA ticket is allowed to move onto the next stage of development and go thru deployment without the conflict being resolved.

 

A possible solution would be for the automatic merge commit message to mention the initial source of the automatic merge. For example, if the automatic merge is due to MUREXSAND-21, this particular JIRA key can be mentioned in the commit message. This would in turn allow JIRA to catch such a conflict as we will be able to see a open pull request on the ticket (and hence blocking the JIRA from moving forward in status).

 

Sadly, the automatic merge commit message does not seem to be editable.


Please let me know if there are any other methods that might solve the problem I am facing.

 

Thank you

0 answers

Suggest an answer

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

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

223 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