Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,463,496
Community Members
 
Community Events
176
Community Groups

A proper merge commit....how to do within a PR?

How to do TRUE merge as part of a PR (meaning a new merge commit that has 2 - or more parents). Not a FF (that makes it look like work was done "on" the target branch); not a Squash (that eliminates the history)....

2 answers

0 votes
Patrik S Atlassian Team Aug 02, 2022

Hello @David V_ Corbin ,

Thank you for reaching out to Atlassian Community.

When you click the "Merge" button in a pull request, a new panel will be displayed with an option to choose which merge strategy you'd like to use : 

Screen Shot 2022-08-02 at 18.01.19.png

The currently available option are Merge commit, squad, or Fast forward. Accordingly to your description, the option that would create a new commit with two parents would be Merge commit.

You can also set the default merge strategy in a given repository by going to Repository Settings > Merge Strategies.

Hope that helps! Let me know in case you have any questions.

Thank you, @David V_ Corbin .

Kind regards,

Patrik S

0 votes

Hello David,

to override the merge-commit message Bitbucket creates you can trigger a PR merge via the Bitbucket cloud rest api https://developer.atlassian.com/cloud/bitbucket/rest/api-group-pullrequests/#api-repositories-workspace-repo-slug-pullrequests-pull-request-id-merge-post and define the merge message via the 'message' request parameter.

Hope that helps

Ulrich

// Izymes

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS

Atlassian Community Events