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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Rebase and merge with no fast forward option

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.

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Atlassian Community Events

Hello from city #68 on the road!

Hello from my sixty-eighth city in a long-term RV trip I started in 2015!  I've traveled all over the US staying in different cities and states for just a few days up to many months. This week I...

43 views 1 7
Read article

Community Events

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

Events near you