I was looking for different options for merging the feature branch into master branch and came across this page: https://confluence.atlassian.com/bitbucketserver/pull-request-merge-strategies-844499235.html
Can you explain me about the #4 Rebase, merge (rebase + merge --no-ff) and how do I perform this operation using git command line?
As to my knowledge, git rebase command has no “fast-forward” or “no-fast-forward” option as it is not merging anything and only integrating the (local feature) branch with master branch.
Summit 2020 is one of your best opportunities to get trained—or certified—in Atlassian products. You'll be in an exciting atmosphere, surrounded by Atlassian experts who are all eager to help ea...
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