Comments by "TommyJ" (@ImperiumLibertas) on "I Learned Haskell In 15 Years" video.

@lamspam he has talked about it in more detail at other times. He specifically mentioned that rebase should not be used for shared branches. He's talking specifically about which strategy you pull new upstream changes into your personal branch. Merge is terrible for this use case because it inserts commits in chronological order using algorithms to resolve conflicts instead of treating the git history as a series of changes on top of a base state. Ideally all the changes from a single feature branch would be on top and all unrelated commits below. Also, cleaning git history by rebasing to allow for renaming and squashing commits becomes incredibly tedious once a merge has happened because every commit after the merge commit will almost always have a conflict.
1