I build things with my hands. The human behind Shift - https://laravelshift.com, master of Git - https://gettinggit.com, and author of "BaseCode" - https://basecodefieldguide.com
git rebase is likely reserved for feature branches to prepare them for merge. Under Git Flow, you'd likely never want to run git rebase on the long lived branches.
The git merge --no-ff ensures the merge does notfast forward your commits onto the target branch. Essentially, this guarantees a merge commit.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
git rebaseis likely reserved for feature branches to prepare them for merge. Under Git Flow, you'd likely never want to rungit rebaseon the long lived branches.The
git merge --no-ffensures the merge does not fast forward your commits onto the target branch. Essentially, this guarantees a merge commit.