Git merge or git rebase?

Question

I have read the git plain merge fits some cases while git rebase fits other cases when doing merges in Git.

But I don't see how a rebase can be a substitute for a merge. After rebasing a branch it still needs to followed by a merge which is simply more likely to be a fast forward merge. So as I understand Rebase is simply used to "guarantee" a fast forward merge - it is not a substitute for git merge. Correct?

Answer 1

That's basically it (or, at least, one reason to use rebase). It guarantees a fast-forward merge. (I also find it easier to fix conflicts when rebasing as opposing to merging, especially when using git rerere.)