Two people on my team today have pushed branches to origin (on the BitBucket server) and ended up with unrequested merges to the master branch. It's like our repo is broken or something. Has anyone else ever encountered this behavior?
Check and see if you have enabled automatic merging in the repository.
Hey Mikael. Where is that setting? I think I remember where it used to be, but I don't see branching strategies on the settings menu anymore.
Go to Repository settings > Branching model, the check box for automatic merge should be at the bottom.
