Automatic merge fast-forwarded instead of creating a merge commit Edited

We are using automatic branch merging in Bitbucket Server with the following model:

  • release/1.0 merges into
  • release/1.1 merges into
  • master

Topic branches are merged into either release/1.0 or release/1.1. master only differs from release/1.1 by automatic merge commits.

Usually, each merge produces an explicit merge commit.

This morning, I merged a topic branch into release/1.0. I expected this to produce three merge commits: topic-branch into release/1.0, release/1.0 into release/1.1, and release/1.1 into master. Instead of that last commit, master was fast-forwarded to the new tip of release/1.1.

There were no merge conflicts.

What could be causing this behaviour, and how to avoid it in the future?

0 answers

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 12, 2018 in Bitbucket

Do you use any Atlassian products for your personal projects?

After spinning my wheels trying to get organized enough to write a book for National Novel Writing Month (NaNoWriMo) I took my affinity for Atlassian products from my work life and decided to tr...

27,245 views 26 12
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you