DEV Community

loading...

Discussion on: I'm a Git Master, Ask Me Anything

Collapse
gonedark profile image
Jason McCreary Ask Me Anything

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 not fast forward your commits onto the target branch. Essentially, this guarantees a merge commit.