We are using automatic branch merging in Bitbucket Server with the following model:
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?
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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